From 2ad78a33fb2d84ff3d9395221951605388dbc6a6 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 18 Nov 2011 19:49:03 -0700
Subject: [PATCH] fix `provide' for macro-introduced bindings in phase != 0,#f

---
 collects/tests/racket/macro.rktl | 15 +++++++++++++++
 src/racket/src/module.c          | 26 ++++++++++++++++++++------
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/collects/tests/racket/macro.rktl b/collects/tests/racket/macro.rktl
index 073bf4e3a6..23306290bb 100644
--- a/collects/tests/racket/macro.rktl
+++ b/collects/tests/racket/macro.rktl
@@ -637,6 +637,21 @@
     (write (compile s) o)
     (test (syntax->datum (eval (read i))) values '(#s(foo bar)))))
 
+;; ----------------------------------------
+;; Check provide of marked names in various phases:
+
+(module phase-providing-check racket/base
+  (define-syntax-rule (bounce phase)
+    (begin
+      (#%require (for-meta phase racket/base))
+      (#%provide (for-meta phase printf))))
+
+  (bounce 0)
+  (bounce 1)
+  (bounce 2)
+  (bounce #f)
+  (define printf 'ok!))
+
 ;; ----------------------------------------
 
 (report-errs)
diff --git a/src/racket/src/module.c b/src/racket/src/module.c
index 53f203dd55..ae0ee0e4b0 100644
--- a/src/racket/src/module.c
+++ b/src/racket/src/module.c
@@ -8247,14 +8247,24 @@ static Scheme_Object *extract_free_id_name(Scheme_Object *name,
 {
   *_implicit = 0;
 
+  if (genv) {
+    if (SCHEME_FALSEP(phase)) {
+      /* genv is used for tl_id_sym */
+    } else {
+      int i;
+      for (i = SCHEME_INT_VAL(phase); i--; ) {
+        genv = genv->exp_env;
+        if (!genv) break;
+      }
+    }
+  }
+
   while (1) { /* loop for free-id=? renaming */
     if (SCHEME_STXP(name)) {
       if (genv
-          && (always
-              || SAME_OBJ(phase, scheme_make_integer(0))
-              || SAME_OBJ(phase, scheme_make_integer(1))))
+          && (always || SCHEME_INTP(phase))) {
         name = scheme_tl_id_sym(genv, name, NULL, -1, phase, NULL);
-      else
+      } else
         name = SCHEME_STX_VAL(name); /* shouldn't get here; no `define-for-label' */
     }
     
@@ -8437,8 +8447,12 @@ void compute_provide_arrays(Scheme_Hash_Table *all_provided, Scheme_Hash_Table *
             /* Not defined! */
             char buf[32], *phase_expl;
             if (phase) {
-              sprintf(buf, " for phase %" PRIxPTR, SCHEME_INT_VAL(phase));
-              phase_expl = scheme_strdup(buf);
+              if (SCHEME_FALSEP(phase)) {
+                phase_expl = " for-label";
+              } else {
+                sprintf(buf, " for phase %" PRIxPTR, SCHEME_INT_VAL(phase));
+                phase_expl = scheme_strdup(buf);
+              }
             } else
               phase_expl = "";
             scheme_wrong_syntax("module", prnt_name, form,