expander: repair attach of module with a for-label import

Fixes a bug in a847564.
racket · May 13, 2024 · 42f75b9 · 42f75b9
1 parent a847564
commit 42f75b9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/pkgs/racket-test-core/tests/racket/module.rktl b/pkgs/racket-test-core/tests/racket/module.rktl
@@ -329,6 +329,14 @@
           ;; is correctly attached as instantiated in this namespace
           (eval stx))))
 
+(module uses-m-at-label-phase racket/base
+  (require (for-label 'provides-variable-m-at-phase-1)))
+(test #t void? (dynamic-require ''uses-m-at-label-phase #f))
+(let ([orig (current-namespace)])
+  (parameterize ([current-namespace (make-base-namespace)])
+    (namespace-attach-module orig ''uses-m-at-label-phase)))
+
+
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Check redundant import and re-provide
 

diff --git a/racket/src/bc/src/startup.inc b/racket/src/bc/src/startup.inc
diff --git a/racket/src/cs/schemified/expander.scm b/racket/src/cs/schemified/expander.scm
diff --git a/racket/src/expander/namespace/module.rkt b/racket/src/expander/namespace/module.rkt
@@ -408,7 +408,8 @@
   ((module-force-bulk-binding m) (namespace-bulk-binding-registry ns)))
 
 (define (module-instantiates-at-level? m phase-level)
-  (<= (module-min-phase-level m) phase-level (module-max-phase-level m)))
+  (and (not (label-phase? phase-level))
+       (<= (module-min-phase-level m) phase-level (module-max-phase-level m))))
 
 ;; ----------------------------------------