Fix global variables traversal

To emit extern-ed variable in local scope into linking section.
tyfkda · Feb 19, 2024 · aad7af9 · aad7af9
1 parent ac6d092
commit aad7af9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/src/wcc/emit_wasm.c b/src/wcc/emit_wasm.c
@@ -181,16 +181,15 @@ static Vector *construct_data_segment(void) {
   uint32_t address = 0;
 #endif
   for (int k = 0; k < 2; ++k) {  // 0=data, 1=bss
-    for (int i = 0, len = global_scope->vars->len; i < len; ++i) {
-      VarInfo *varinfo = global_scope->vars->data[i];
+    const Name *name;
+    GVarInfo *info;
+    for (int it = 0; (it = table_iterate(&gvar_info_table, it, &name, (void**)&info)) != -1; ) {
+      const VarInfo *varinfo = info->varinfo;
       if (varinfo->storage & (VS_EXTERN | VS_ENUM_MEMBER) || varinfo->type->kind == TY_FUNC)
         continue;
       if ((k == 0) == (varinfo->global.init == NULL) ||
           !is_global_datsec_var(varinfo, global_scope))
         continue;
-      GVarInfo *info = get_gvar_info_from_name(varinfo->name);
-      if (info == NULL)
-        continue;
 
 #ifndef NDEBUG
       uint32_t adr = info->non_prim.address;
@@ -417,13 +416,12 @@ static void emit_global_section(EmitWasm *ew) {
   data_open_chunk(&globals_section);
   uint32_t globals_count = 0;
   for (int k = 0; k < 2; ++k) {  // 0=resolved(data), 1=resolved(bss)
-    for (int i = 0, len = global_scope->vars->len; i < len; ++i) {
-      VarInfo *varinfo = global_scope->vars->data[i];
+    const Name *name;
+    GVarInfo *info;
+    for (int it = 0; (it = table_iterate(&gvar_info_table, it, &name, (void**)&info)) != -1; ) {
+      const VarInfo *varinfo = info->varinfo;
       if (varinfo->storage & VS_ENUM_MEMBER || varinfo->type->kind == TY_FUNC)
         continue;
-      GVarInfo *info = get_gvar_info_from_name(varinfo->name);
-      if (info == NULL)
-        continue;
 
       if ((info->flag & GVF_UNRESOLVED) || is_global_datsec_var(varinfo, global_scope) ||
           (varinfo->global.init == NULL) == (k == 0))
@@ -678,8 +676,10 @@ static void emit_linking_section(EmitWasm *ew) {
   }
   // Globals
   for (int k = 0; k < 3; ++k) {  // 0=unresolved, 1=resolved(data), 2=resolved(bss)
-    for (int i = 0, len = global_scope->vars->len; i < len; ++i) {
-      VarInfo *varinfo = global_scope->vars->data[i];
+    const Name *name;
+    GVarInfo *info;
+    for (int it = 0; (it = table_iterate(&gvar_info_table, it, &name, (void**)&info)) != -1; ) {
+      const VarInfo *varinfo = info->varinfo;
       if (varinfo->storage & VS_ENUM_MEMBER || varinfo->type->kind == TY_FUNC)
         continue;
       GVarInfo *info = get_gvar_info_from_name(varinfo->name);

diff --git a/src/wcc/traverse.c b/src/wcc/traverse.c
@@ -550,6 +550,13 @@ static void traverse_vardecl(Stmt *stmt) {
         if (varinfo->type->kind == TY_FUNC) {
           // Local extern function declaration.
           register_func_info(decl->ident, NULL, varinfo, 0);
+        } else if (varinfo->storage & VS_EXTERN) {
+          assert(!is_global_scope(curscope));
+          if (out_type < OutExecutable) {
+            // Register into global to output linking information.
+            GVarInfo *info = register_gvar_info(decl->ident, varinfo);  // TODO: Confirm.
+            info->flag |= GVF_UNRESOLVED;
+          }
         }
         if (!(varinfo->storage & (VS_EXTERN | VS_STATIC)))
           traverse_initializer(varinfo->local.init);
@@ -783,13 +790,11 @@ uint32_t traverse_ast(Vector *decls, Vector *exports, uint32_t stack_size) {
     for (int k = 0; k < 3; ++k) {  // 0=unresolved, 1=resolved(data), 2=resolved(bss)
       static const char *kTitle[] = {"import", "data", "bss"};
       VERBOSE("### Globals(%s)\n", kTitle[k]);
-      for (int i = 0, len = global_scope->vars->len; i < len; ++i) {
-        VarInfo *varinfo = global_scope->vars->data[i];
+      GVarInfo *info;
+      for (int it = 0; (it = table_iterate(&gvar_info_table, it, &name, (void**)&info)) != -1; ) {
+        const VarInfo *varinfo = info->varinfo;
         if (varinfo->storage & VS_ENUM_MEMBER || varinfo->type->kind == TY_FUNC)
           continue;
-        GVarInfo *info = get_gvar_info_from_name(varinfo->name);
-        if (info == NULL)
-          continue;
         if ((k == 0 && !(info->flag & GVF_UNRESOLVED)) ||
             (k != 0 && ((info->flag & GVF_UNRESOLVED) || (varinfo->global.init == NULL) == (k == 1))))
           continue;
@@ -841,15 +846,14 @@ uint32_t traverse_ast(Vector *decls, Vector *exports, uint32_t stack_size) {
     for (int k = 0; k < 2; ++k) {  // 0: data, 1: bss
       if (k == 1)
         VERBOSE("---- BSS  0x%x\n", address);
-      for (int i = 0, len = global_scope->vars->len; i < len; ++i) {
-        VarInfo *varinfo = global_scope->vars->data[i];
+      const Name *name;
+      GVarInfo *info;
+      for (int it = 0; (it = table_iterate(&gvar_info_table, it, &name, (void**)&info)) != -1; ) {
+        const VarInfo *varinfo = info->varinfo;
         if (varinfo->storage & (VS_EXTERN | VS_ENUM_MEMBER) || varinfo->type->kind == TY_FUNC)
           continue;
         if ((varinfo->global.init == NULL) == (k == 0) || !is_global_datsec_var(varinfo, global_scope))
           continue;
-        GVarInfo *info = get_gvar_info_from_name(varinfo->name);
-        if (info == NULL)
-          continue;
 
         // Mapped to memory
         address = ALIGN(address, align_size(varinfo->type));