CLJS-1435: self-host: lexical scope is broken

Author: crisptrutski

src/main/clojure/cljs/compiler.cljc

@@ -55,6 +55,11 @@
        (some #{(str name)} (ns-first-segments)) (inc d)
        :else d))))
 
+(defn hash-scope [s]
+  #?(:clj (System/identityHashCode s)
+     :cljs (hash-combine (-hash ^not-native (:name s))
+             (shadow-depth s))))
+
 (declare munge)
 
 (defn fn-self-name [{:keys [name info] :as name-var}]
@@ -86,8 +91,7 @@
          (fn-self-name s)
          ;; Unshadowing
          (let [depth       (shadow-depth s)
-               code        #?(:clj  (System/identityHashCode s)
-                              :cljs (-hash ^not-native name))
+               code        (hash-scope s)
                renamed     (get *lexical-renames* code)
                name        (cond
                              (true? field) (str "self__." name)
@@ -862,8 +866,7 @@
                   (map
                     (fn [binding]
                       (let [name (:name binding)]
-                        (vector #?(:clj  (System/identityHashCode binding)
-                                   :cljs (-hash ^not-native name))
+                        (vector (hash-scope binding)
                           (gensym (str name "-")))))
                     bindings)))]
       (doseq [{:keys [init] :as binding} bindings]

src/test/self/self_host/test.cljs

@@ -93,7 +93,7 @@
 
 (deftest test-eval-str
   (async done
-    (let [l (latch 5 done)]
+    (let [l (latch 6 done)]
       (cljs/eval-str st "(+ 1 1)" nil
         {:eval node-eval}
         (fn [{:keys [error value]}]
@@ -139,6 +139,14 @@
         (fn [{:keys [error value]}]
           (is (nil? error))
           (is (== 3 (js/cljs.user.foo 1 2)))
+          (inc! l)))
+      (cljs/eval-str st "(def foo (let [x 1] (let [x (inc x)] x)))" nil
+        {:eval node-eval
+         :context :statement
+         :def-emits-var true}
+        (fn [{:keys [error value]}]
+          (is (nil? error))
+          (is (== 2 js/cljs.user.foo))
           (inc! l))))))
 
 #_(deftest test-eval-str-with-require
@@ -178,4 +186,4 @@
 (set! *main-cli-fn* -main)
 
 (comment
-  )
+  )