| author |  Parker Liu <flyfish30@users.noreply.github.com> 2025-04-01 01:22:03+08:00 |
| committer |  GitHub <noreply@github.com> 2025-03-31 20:22:03+03:00 |
| log | 0bdc0bb534ed6d3cc787b5bca44173d2b49480da |
| tree | 0344b4b07edca28ee5d306c04d46e7b442984684 |
| parent | 0753af792a41645b6cac51d7bd29b2c526c3b81b |
| signature |  Signed by PGP key B5690EEEBB952194 |
translate-c: fix referencing extern locals from nested blocks
3 files changed, 36 insertions(+), 2 deletions(-)
lib- compiler
- test
- cases
- run_translated_c
lib/compiler/aro_translate_c.zig+5-1
| ... | @@ -1620,7 +1620,11 @@ pub fn ScopeExtra(comptime ScopeExtraContext: type, comptime ScopeExtraType: typ | ... | @@ -1620,7 +1620,11 @@ pub fn ScopeExtra(comptime ScopeExtraContext: type, comptime ScopeExtraType: typ |
| 1620 | .root => null, | 1620 | .root => null, |
| 1621 | .block => ret: { | 1621 | .block => ret: { |
| 1622 | const block = @as(*Block, @fieldParentPtr("base", scope)); | 1622 | const block = @as(*Block, @fieldParentPtr("base", scope)); |
| 1623 | break :ret block.getLocalExternAlias(name); | 1623 | const alias_name = block.getLocalExternAlias(name); |
| 1624 | if (alias_name) |_alias_name| { | ||
| 1625 | break :ret _alias_name; | ||
| 1626 | } | ||
| 1627 | break :ret scope.parent.?.getLocalExternAlias(name); | ||
| 1624 | }, | 1628 | }, |
| 1625 | .loop, .do_loop, .condition => scope.parent.?.getLocalExternAlias(name), | 1629 | .loop, .do_loop, .condition => scope.parent.?.getLocalExternAlias(name), |
| 1626 | }; | 1630 | }; |
src/translate_c.zig+8-1
| ... | @@ -1964,7 +1964,14 @@ fn transImplicitCastExpr( | ... | @@ -1964,7 +1964,14 @@ fn transImplicitCastExpr( |
| 1964 | return maybeSuppressResult(c, result_used, sub_expr_node); | 1964 | return maybeSuppressResult(c, result_used, sub_expr_node); |
| 1965 | } | 1965 | } |
| 1966 | 1966 | ||
| 1967 | const addr = try Tag.address_of.create(c.arena, sub_expr_node); | 1967 | const index_val = try Tag.integer_literal.create(c.arena, "0"); |
| 1968 | const index = try Tag.as.create(c.arena, .{ | ||
| 1969 | .lhs = try Tag.type.create(c.arena, "usize"), | ||
| 1970 | .rhs = try Tag.int_cast.create(c.arena, index_val), | ||
| 1971 | }); | ||
| 1972 | const array0_node = try Tag.array_access.create(c.arena, .{ .lhs = sub_expr_node, .rhs = index }); | ||
| 1973 | // Convert array to pointer by expression: addr = &sub_expr[0] | ||
| 1974 | const addr = try Tag.address_of.create(c.arena, array0_node); | ||
| 1968 | const casted = try transCPtrCast(c, scope, expr.getBeginLoc(), dest_type, src_type, addr); | 1975 | const casted = try transCPtrCast(c, scope, expr.getBeginLoc(), dest_type, src_type, addr); |
| 1969 | return maybeSuppressResult(c, result_used, casted); | 1976 | return maybeSuppressResult(c, result_used, casted); |
| 1970 | }, | 1977 | }, |
test/cases/run_translated_c/sub_scope_extern_local_var_ref.c created+23
| ... | @@ -0,0 +1,23 @@ | ||
| 1 | #include <stdlib.h> | ||
| 2 | int a = 42; | ||
| 3 | int foo(int bar) { | ||
| 4 | extern int a; | ||
| 5 | if (bar) { | ||
| 6 | return a; | ||
| 7 | } | ||
| 8 | return 0; | ||
| 9 | } | ||
| 10 | int main() { | ||
| 11 | int result1 = foo(0); | ||
| 12 | if (result1 != 0) abort(); | ||
| 13 | int result2 = foo(1); | ||
| 14 | if (result2 != 42) abort(); | ||
| 15 | a = 100; | ||
| 16 | int result3 = foo(1); | ||
| 17 | if (result3 != 100) abort(); | ||
| 18 | return 0; | ||
| 19 | } | ||
| 20 | |||
| 21 | // run-translated-c | ||
| 22 | // c_frontend=clang | ||
| 23 | // link_libc=true | ||