do unrolls at top-level

1 files changed, 11 insertions, 8 deletions

diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj
index a65443da..2f594afc 100644
--- a/src/clj/clojure/core.clj
+++ b/src/clj/clojure/core.clj
@@ -3448,9 +3448,9 @@
 (def gen-class)
 
 (defmacro with-loading-context [& body]
-  `((fn this# [] 
+  `((fn loading# [] 
         (. clojure.lang.Var (pushThreadBindings {clojure.lang.Compiler/LOADER  
-                                                 (-> this# .getClass .getClassLoader)}))
+                                                 (-> loading# .getClass .getClassLoader)}))
         (try
          ~@body
          (finally
@@ -3493,13 +3493,16 @@
         gen-class-call
           (when gen-class-clause
             (list* `gen-class :name (.replace (str name) \- \_) :impl-ns name :main true (next gen-class-clause)))
-        references (remove #(= :gen-class (first %)) references)]
-    `(with-loading-context
+        references (remove #(= :gen-class (first %)) references)
+        ;ns-effect (clojure.core/in-ns name)
+        ]
+    `(do
        (clojure.core/in-ns '~name)
-       ~@(when gen-class-call (list gen-class-call))
-       ~@(when (and (not= name 'clojure.core) (not-any? #(= :refer-clojure (first %)) references))
-           `((clojure.core/refer '~'clojure.core)))
-       ~@(map process-reference references))))
+       (with-loading-context
+        ~@(when gen-class-call (list gen-class-call))
+        ~@(when (and (not= name 'clojure.core) (not-any? #(= :refer-clojure (first %)) references))
+            `((clojure.core/refer '~'clojure.core)))
+        ~@(map process-reference references)))))
 
 (defmacro refer-clojure
   "Same as (refer 'clojure.core <filters>)"