authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-08-20 10:45:55+03:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-08-20 10:45:55+03:00
loga553947a51bc5858ff40fb47dfe41daaa9ff75bf
tree8e8803ec59d72bb69b480c19f25286ed0164dfa2
parentadc5bce5e8487cf9507ab5dd2b1b60dd7f54cc3d
signaturelock-open Commit is signed but in an unrecognized format.

translate-c: correctly put static and extern local variables in global scope

3 files changed, 46 insertions(+), 10 deletions(-)

src-self-hosted/translate_c.zig+16-9
......@@ -498,7 +498,7 @@ fn declVisitor(c: *Context, decl: *const ZigClangDecl) Error!void {
498498 _ = try transRecordDecl(c, @ptrCast(*const ZigClangRecordDecl, decl));
499499 },
500500 .Var => {
501 return visitVarDecl(c, @ptrCast(*const ZigClangVarDecl, decl));
501 return visitVarDecl(c, @ptrCast(*const ZigClangVarDecl, decl), null);
502502 },
503503 .Empty => {
504504 // Do nothing
......@@ -679,12 +679,13 @@ fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void {
679679 return addTopLevelDecl(c, fn_name, &proto_node.base);
680680}
681681
682fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {
683 const var_name = try c.str(ZigClangNamedDecl_getName_bytes_begin(@ptrCast(*const ZigClangNamedDecl, var_decl)));
682/// if mangled_name is not null, this var decl was declared in a block scope.
683fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl, mangled_name: ?[]const u8) Error!void {
684 const var_name = mangled_name orelse try c.str(ZigClangNamedDecl_getName_bytes_begin(@ptrCast(*const ZigClangNamedDecl, var_decl)));
684685 if (c.global_scope.sym_table.contains(var_name))
685686 return; // Avoid processing this decl twice
686687 const rp = makeRestorePoint(c);
687 const visib_tok = try appendToken(c, .Keyword_pub, "pub");
688 const visib_tok = if (mangled_name) |_| null else try appendToken(c, .Keyword_pub, "pub");
688689
689690 const thread_local_token = if (ZigClangVarDecl_getTLSKind(var_decl) == .None)
690691 null
......@@ -1582,15 +1583,22 @@ fn transDeclStmtOne(
15821583 .Var => {
15831584 const var_decl = @ptrCast(*const ZigClangVarDecl, decl);
15841585
1585 const thread_local_token = if (ZigClangVarDecl_getTLSKind(var_decl) == .None)
1586 null
1587 else
1588 try appendToken(c, .Keyword_threadlocal, "threadlocal");
15891586 const qual_type = ZigClangVarDecl_getTypeSourceInfo_getType(var_decl);
15901587 const name = try c.str(ZigClangNamedDecl_getName_bytes_begin(
15911588 @ptrCast(*const ZigClangNamedDecl, var_decl),
15921589 ));
15931590 const mangled_name = try block_scope.makeMangledName(c, name);
1591
1592 switch (ZigClangVarDecl_getStorageClass(var_decl)) {
1593 .Extern, .Static => {
1594 // This is actually a global variable, put it in the global scope and reference it.
1595 // `_ = mangled_name;`
1596 try visitVarDecl(rp.c, var_decl, mangled_name);
1597 return try maybeSuppressResult(rp, scope, .unused, try transCreateNodeIdentifier(rp.c, mangled_name));
1598 },
1599 else => {},
1600 }
1601
15941602 const mut_tok = if (ZigClangQualType_isConstQualified(qual_type))
15951603 try appendToken(c, .Keyword_const, "const")
15961604 else
......@@ -1618,7 +1626,6 @@ fn transDeclStmtOne(
16181626 .mut_token = mut_tok,
16191627 .semicolon_token = semicolon_token,
16201628 }, .{
1621 .thread_local_token = thread_local_token,
16221629 .eq_token = eq_token,
16231630 .type_node = type_node,
16241631 .init_node = init_node,
test/run_translated_c.zig+14
......@@ -3,6 +3,20 @@ const tests = @import("tests.zig");
33const nl = std.cstr.line_sep;
44
55pub fn addCases(cases: *tests.RunTranslatedCContext) void {
6 cases.add("static variable in block scope",
7 \\#include <stdlib.h>
8 \\int foo() {
9 \\ static int bar;
10 \\ bar += 1;
11 \\ return bar;
12 \\}
13 \\int main() {
14 \\ foo();
15 \\ foo();
16 \\ if (foo() != 3) abort();
17 \\}
18 , "");
19
620 cases.add("array initializer",
721 \\#include <stdlib.h>
822 \\int main(int argc, char **argv) {
test/translate_c.zig+16-1
......@@ -3,6 +3,20 @@ const std = @import("std");
33const CrossTarget = std.zig.CrossTarget;
44
55pub fn addCases(cases: *tests.TranslateCContext) void {
6 cases.add("extern variable in block scope",
7 \\float bar;
8 \\int foo() {
9 \\ _Thread_local static int bar = 2;
10 \\}
11 , &[_][]const u8{
12 \\pub export var bar: f32 = @import("std").mem.zeroes(f32);
13 \\threadlocal var bar_1: c_int = 2;
14 \\pub export fn foo() c_int {
15 \\ _ = bar_1;
16 \\ return 0;
17 \\}
18 });
19
620 cases.add("missing return stmt",
721 \\int foo() {}
822 \\int bar() {
......@@ -480,8 +494,9 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
480494 \\ static const char v2[] = "2.2.2";
481495 \\}
482496 , &[_][]const u8{
497 \\const v2: [*c]const u8 = "2.2.2";
483498 \\pub export fn foo() void {
484 \\ const v2: [*c]const u8 = "2.2.2";
499 \\ _ = v2;
485500 \\}
486501 });
487502