From 654e846720e0ce08ebf138aa0775822ed3ab1297 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 27 Feb 2018 06:46:55 -0700
Subject: [PATCH] namespace-attach-module: fix namespace for declaration
 callback

---
 racket/src/expander/namespace/attach.rkt |  3 ++-
 racket/src/racket/src/startup.inc        | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/racket/src/expander/namespace/attach.rkt b/racket/src/expander/namespace/attach.rkt
index 1d898c031e..cc6e4091b7 100644
--- a/racket/src/expander/namespace/attach.rkt
+++ b/racket/src/expander/namespace/attach.rkt
@@ -138,7 +138,8 @@
          [(phase m-ns) (in-hash phases)])
     (define m (namespace->module src-namespace mod-name))
     (module-force-bulk-binding! m src-namespace)
-    (declare-module! dest-namespace m mod-name)
+    (parameterize ([current-namespace dest-namespace])
+      (declare-module! dest-namespace m mod-name))
     (when m-ns
       (namespace-record-module-instance-attached! src-namespace mod-name phase)
       (or (namespace->module-namespace dest-namespace mod-name phase)
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index f69ab02a36..9ebcbe3b19 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -42241,6 +42241,15 @@ static const char *startup_source =
 "(module-force-bulk-binding!"
 " m_21"
 " src-namespace_6)"
+"(with-continuation-mark"
+" parameterization-key"
+"(extend-parameterization"
+"(continuation-mark-set-first"
+" #f"
+" parameterization-key)"
+" 1/current-namespace"
+" dest-namespace_2)"
+"(let-values()"
 "(let-values(((dest-namespace44_0)"
 " dest-namespace_2)"
 "((m45_0)"
@@ -42252,7 +42261,7 @@ static const char *startup_source =
 " #f"
 " dest-namespace44_0"
 " m45_0"
-" mod-name46_0))"
+" mod-name46_0))))"
 "(if m-ns_15"
 "(let-values()"
 "(begin"