Fix importing over a previously defined constant

JuliaLang · Jun 27, 2024 · aa4b302 · aa4b302
1 parent 6282a92
commit aa4b302
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/module.c b/src/module.c
@@ -656,7 +656,8 @@ static void module_import_(jl_module_t *to, jl_module_t *from, jl_sym_t *asname,
         else {
             if (eq_bindings(bpart, bto, jl_current_task->world_age)) {
                 // already imported - potentially upgrade to _IMPORTED or _EXPLICIT
-                btopart->kind = (explici != 0) ? BINDING_KIND_IMPORTED : BINDING_KIND_EXPLICIT;
+                if (jl_bpart_is_some_import(btopart))
+                    btopart->kind = (explici != 0) ? BINDING_KIND_IMPORTED : BINDING_KIND_EXPLICIT;
                 // TODO: This will need to be versioned when partitioned
             }
             else if (jl_bpart_is_some_import(btopart)) {

diff --git a/test/syntax.jl b/test/syntax.jl
@@ -3872,3 +3872,13 @@ module BarDualImport
 import ..FooDualImport
 import ..FooDualImport.FooDualImport
 end
+
+# Test trying to define a constant and then importing the same constant
+const ImportConstant = 1
+module ImportConstantTestModule
+    using Test
+    const ImportConstant = 1
+    import ..ImportConstant
+    @test ImportConstant == 1
+    @test isconst(@__MODULE__, :ImportConstant)
+end