Replace Var_t's m_v with the symbol in the current scope

Author: Thirumalai-Shaktivel

src/libasr/asr_scopes.cpp

@@ -147,7 +147,7 @@ void SymbolTable::move_symbols_from_global_scope(Allocator &al,
             } case (ASR::symbolType::Function) : {
                 ASR::Function_t *fn = ASR::down_cast<ASR::Function_t>(a.second);
 
-                // Replace Var_t's m_v with the symbols in the current scope
+                // Replace Var_t's m_v with the symbol in the current scope
                 ASRUtils::VarExprVisitor replace_symbols(al, fn->m_symtab);
                 replace_symbols.visit_Function(*fn);
 

src/libasr/asr_utils.h

@@ -2103,24 +2103,27 @@ class VarExprReplacer: public ASR::BaseExprReplacer<VarExprReplacer>
 
     void replace_Var(ASR::Var_t *x) {
         std::string sym_name = ASRUtils::symbol_name(x->m_v);
+        ASR::symbol_t *var_s = current_scope->get_symbol(sym_name);
         // Check for the symbol in the current scope; if available, return
-        if (current_scope->get_symbol(sym_name)) {
-            return;
-        }
-        // otherwise, get the symbol from the module scope.
-        // Create an ExternalSymbol and add it to the current scope.
-        ASR::symbol_t *var_s = current_scope->resolve_symbol(sym_name);
-        LCOMPILERS_ASSERT(var_s != nullptr)
-        LCOMPILERS_ASSERT(ASR::is_a<ASR::Variable_t>(*var_s))
-        ASR::Variable_t *v = ASR::down_cast<ASR::Variable_t>(var_s);
-        var_s = (ASR::symbol_t *) ASR::make_ExternalSymbol_t(al,
-            v->base.base.loc, current_scope, v->m_name, var_s,
-            s2c(al, "_global_symbols"), nullptr, 0, v->m_name,
-            ASR::accessType::Public);
-        current_scope->add_symbol(v->m_name, var_s);
-        // Replace the symbol with an ExternalSymbol
-        *current_expr = ASRUtils::EXPR(ASR::make_Var_t(al,
-            x->base.base.loc, var_s));
+        if (var_s != nullptr) {
+            *current_expr = ASRUtils::EXPR(ASR::make_Var_t(al,
+                x->base.base.loc, var_s));
+        } else {
+            // otherwise, get the symbol from the module scope.
+            // Create an ExternalSymbol and add it to the current scope.
+            var_s = current_scope->resolve_symbol(sym_name);
+            LCOMPILERS_ASSERT(var_s != nullptr)
+            LCOMPILERS_ASSERT(ASR::is_a<ASR::Variable_t>(*var_s))
+            ASR::Variable_t *v = ASR::down_cast<ASR::Variable_t>(var_s);
+            var_s = (ASR::symbol_t *) ASR::make_ExternalSymbol_t(al,
+                v->base.base.loc, current_scope, v->m_name, var_s,
+                s2c(al, "_global_symbols"), nullptr, 0, v->m_name,
+                ASR::accessType::Public);
+            current_scope->add_symbol(v->m_name, var_s);
+            // Replace the symbol with an ExternalSymbol
+            *current_expr = ASRUtils::EXPR(ASR::make_Var_t(al,
+                x->base.base.loc, var_s));
+        }
     }
 };
 

src/libasr/codegen/asr_to_llvm.cpp

@@ -2197,7 +2197,7 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
         } else if (x.m_type->type == ASR::ttypeType::TypeParameter) {
             // Ignore type variables
         } else if (x.m_type->type == ASR::ttypeType::List) {
-            // Handled in ``_lpython_main_program``function_scope
+            // Handled in `_lpython_main_program` function_scope
         } else {
             throw CodeGenError("Variable type not supported", x.base.base.loc);
         }
@@ -5373,6 +5373,7 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
             }
             case ASR::ttypeType::List: {
                 if (is_external) {
+                    std::cout << "List initilize\n";
                     uint32_t h = get_hash((ASR::asr_t*)x);
                     llvm::Type *type;
                     int n_dims = 0, a_kind = 4;

src/libasr/pass/global_stmts.cpp

@@ -130,6 +130,11 @@ void pass_wrap_global_stmts_into_function(Allocator &al,
                 throw LCompilersException("Function already defined");
             }
             unit.m_global_scope->add_symbol(sym_name, down_cast<ASR::symbol_t>(fn));
+
+            // Replace Var_t's m_v with the symbol in the current scope
+            ASR::Function_t *fn_ = ASR::down_cast2<ASR::Function_t>(fn);
+            ASRUtils::VarExprVisitor replace_symbols(al, fn_->m_symtab);
+            replace_symbols.visit_Function(*fn_);
         } else {
             // The last item was a statement, create a subroutine (returning
             // nothing)
@@ -154,6 +159,11 @@ void pass_wrap_global_stmts_into_function(Allocator &al,
                 throw LCompilersException("Function already defined");
             }
             unit.m_global_scope->add_symbol(sym_name, down_cast<ASR::symbol_t>(fn));
+
+            // Replace Var_t's m_v with the symbol in the current scope
+            ASR::Function_t *fn_ = ASR::down_cast2<ASR::Function_t>(fn);
+            ASRUtils::VarExprVisitor replace_symbols(al, fn_->m_symtab);
+            replace_symbols.visit_Function(*fn_);
         }
         unit.m_items = nullptr;
         unit.n_items = 0;