diff options
| author | Vexu <git@vexu.eu> | 2020-03-08 12:07:26 +0200 |
|---|---|---|
| committer | Vexu <git@vexu.eu> | 2020-03-08 12:11:37 +0200 |
| commit | 692a974c3edd05944d33cd579bcb355cdd7199fc (patch) | |
| tree | 029600d5411dfd9c6b8b64b2c0c3df58ac3f340a /src-self-hosted | |
| parent | 5aa993cd617e0ae3cabc9c626e45a748857e2f2a (diff) | |
| download | zig-692a974c3edd05944d33cd579bcb355cdd7199fc.tar.gz zig-692a974c3edd05944d33cd579bcb355cdd7199fc.zip | |
translate-c reject structs with VLAs
Diffstat (limited to 'src-self-hosted')
| -rw-r--r-- | src-self-hosted/clang.zig | 1 | ||||
| -rw-r--r-- | src-self-hosted/translate_c.zig | 14 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src-self-hosted/clang.zig b/src-self-hosted/clang.zig index bdaa8b86dc..3a3b4ac196 100644 --- a/src-self-hosted/clang.zig +++ b/src-self-hosted/clang.zig @@ -812,6 +812,7 @@ pub extern fn ZigClangType_getPointeeType(self: ?*const struct_ZigClangType) str pub extern fn ZigClangType_isVoidType(self: ?*const struct_ZigClangType) bool; pub extern fn ZigClangType_isConstantArrayType(self: ?*const struct_ZigClangType) bool; pub extern fn ZigClangType_isRecordType(self: ?*const struct_ZigClangType) bool; +pub extern fn ZigClangType_isIncompleteOrZeroLengthArrayType(self: ?*const struct_ZigClangType, *const ZigClangASTContext) bool; pub extern fn ZigClangType_isArrayType(self: ?*const struct_ZigClangType) bool; pub extern fn ZigClangType_isBooleanType(self: ?*const struct_ZigClangType) bool; pub extern fn ZigClangType_getTypeClassName(self: *const struct_ZigClangType) [*:0]const u8; diff --git a/src-self-hosted/translate_c.zig b/src-self-hosted/translate_c.zig index b2eb96f2ae..be3e43f3d7 100644 --- a/src-self-hosted/translate_c.zig +++ b/src-self-hosted/translate_c.zig @@ -793,6 +793,7 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!?* while (ZigClangRecordDecl_field_iterator_neq(it, end_it)) : (it = ZigClangRecordDecl_field_iterator_next(it)) { const field_decl = ZigClangRecordDecl_field_iterator_deref(it); const field_loc = ZigClangFieldDecl_getLocation(field_decl); + const field_qt = ZigClangFieldDecl_getType(field_decl); if (ZigClangFieldDecl_isBitField(field_decl)) { const opaque = try transCreateNodeOpaqueType(c); @@ -801,6 +802,13 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!?* break :blk opaque; } + if (ZigClangType_isIncompleteOrZeroLengthArrayType(qualTypeCanon(field_qt), c.clang_context)) { + const opaque = try transCreateNodeOpaqueType(c); + semicolon = try appendToken(c, .Semicolon, ";"); + try emitWarning(c, field_loc, "{} demoted to opaque type - has variable length array", .{container_kind_name}); + break :blk opaque; + } + var is_anon = false; var raw_name = try c.str(ZigClangNamedDecl_getName_bytes_begin(@ptrCast(*const ZigClangNamedDecl, field_decl))); if (ZigClangFieldDecl_isAnonymousStructOrUnion(field_decl)) { @@ -809,7 +817,7 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!?* } const field_name = try appendIdentifier(c, raw_name); _ = try appendToken(c, .Colon, ":"); - const field_type = transQualType(rp, ZigClangFieldDecl_getType(field_decl), field_loc) catch |err| switch (err) { + const field_type = transQualType(rp, field_qt, field_loc) catch |err| switch (err) { error.UnsupportedType => { const opaque = try transCreateNodeOpaqueType(c); semicolon = try appendToken(c, .Semicolon, ";"); @@ -5600,7 +5608,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, }, .Ampersand => { op_token = try appendToken(c, .Ampersand, "&"); - op_id= .BitAnd; + op_id = .BitAnd; }, .Plus => { op_token = try appendToken(c, .Plus, "+"); @@ -5608,7 +5616,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, }, .Minus => { op_token = try appendToken(c, .Minus, "-"); - op_id= .Sub; + op_id = .Sub; }, .AmpersandAmpersand => { op_token = try appendToken(c, .Keyword_and, "and"); |