authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2019-12-28 00:57:37+01:00
committergravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2019-12-28 00:57:37+01:00
log6070ffc28ea8aa64894d62df699fa6def6fc6d8a
treea09681d678729b6b8ae16b5960328ef152147854
parenta38704d0122d5dd91011541d187d1fc115265a7c

Fix crash with forward-declared enums

Closes #3754

2 files changed, 17 insertions(+), 3 deletions(-)

src-self-hosted/translate_c.zig+6-3
...@@ -725,11 +725,15 @@ fn transEnumDecl(c: *Context, enum_decl: *const ZigClangEnumDecl) Error!?*ast.No...@@ -725,11 +725,15 @@ fn transEnumDecl(c: *Context, enum_decl: *const ZigClangEnumDecl) Error!?*ast.No
725 };725 };
726726
727 const int_type = ZigClangEnumDecl_getIntegerType(enum_decl);727 const int_type = ZigClangEnumDecl_getIntegerType(enum_decl);
728 // The underlying type may be null in case of forward-declared enum
729 // types, while that's not ISO-C compliant many compilers allow this and
730 // default to the usual integer type used for all the enums.
728731
729 // TODO only emit this tag type if the enum tag type is not the default.732 // TODO only emit this tag type if the enum tag type is not the default.
730 // I don't know what the default is, need to figure out how clang is deciding.733 // I don't know what the default is, need to figure out how clang is deciding.
731 // it appears to at least be different across gcc/msvc734 // it appears to at least be different across gcc/msvc
732 if (!isCBuiltinType(int_type, .UInt) and735 if (int_type.ptr != null and
736 !isCBuiltinType(int_type, .UInt) and
733 !isCBuiltinType(int_type, .Int))737 !isCBuiltinType(int_type, .Int))
734 {738 {
735 _ = try appendToken(c, .LParen, "(");739 _ = try appendToken(c, .LParen, "(");
...@@ -1555,8 +1559,7 @@ fn transCCast(...@@ -1555,8 +1559,7 @@ fn transCCast(
1555 const elaborated_ty = @ptrCast(*const ZigClangElaboratedType, ZigClangQualType_getTypePtr(dst_type));1559 const elaborated_ty = @ptrCast(*const ZigClangElaboratedType, ZigClangQualType_getTypePtr(dst_type));
1556 return transCCast(rp, scope, loc, ZigClangElaboratedType_getNamedType(elaborated_ty), src_type, expr);1560 return transCCast(rp, scope, loc, ZigClangElaboratedType_getNamedType(elaborated_ty), src_type, expr);
1557 }1561 }
1558 if (ZigClangQualType_getTypeClass(dst_type) == .Enum)1562 if (ZigClangQualType_getTypeClass(dst_type) == .Enum) {
1559 {
1560 const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@intToEnum");1563 const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@intToEnum");
1561 try builtin_node.params.push(try transQualType(rp, dst_type, loc));1564 try builtin_node.params.push(try transQualType(rp, dst_type, loc));
1562 _ = try appendToken(rp.c, .Comma, ",");1565 _ = try appendToken(rp.c, .Comma, ",");
test/translate_c.zig+11
...@@ -814,6 +814,17 @@ pub fn addCases(cases: *tests.TranslateCContext) void {...@@ -814,6 +814,17 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
814814
815 /////////////// Cases that pass for only stage2 ////////////////815 /////////////// Cases that pass for only stage2 ////////////////
816816
817 cases.add_2("Forward-declared enum",
818 \\extern enum enum_ty my_enum;
819 \\enum enum_ty { FOO };
820 , &[_][]const u8{
821 \\pub const FOO = 0;
822 \\pub const enum_enum_ty = extern enum {
823 \\ FOO,
824 \\};
825 \\pub extern var my_enum: enum_enum_ty;
826 });
827
817 cases.add_2("Parameterless function pointers",828 cases.add_2("Parameterless function pointers",
818 \\typedef void (*fn0)();829 \\typedef void (*fn0)();
819 \\typedef void (*fn1)(char);830 \\typedef void (*fn1)(char);