CLJS-2541: binding not made in parallel

Author: mfikes

src/main/cljs/cljs/js.cljs

@@ -184,10 +184,10 @@
                                                     (.fromCharCode js/String (str "0x" match))))
                 (base64/encodeString))))))
 
-(defn- current-alias-map
-  []
-  (->> (merge (get-in @env/*compiler* [::ana/namespaces ana/*cljs-ns* :requires])
-         (get-in @env/*compiler* [::ana/namespaces ana/*cljs-ns* :require-macros]))
+(defn- alias-map
+  [compiler cljs-ns]
+  (->> (merge (get-in compiler [::ana/namespaces cljs-ns :requires])
+         (get-in compiler [::ana/namespaces cljs-ns :require-macros]))
     (remove (fn [[k v]] (symbol-identical? k v)))
     (into {})))
 
@@ -685,7 +685,7 @@
                  ana/*fn-invoke-direct* (and (:static-fns opts) (:fn-invoke-direct opts))
                  *ns*                   (create-ns ns)
                  ana/*passes*           (:*passes* bound-vars)
-                 r/*alias-map*          (current-alias-map)
+                 r/*alias-map*          (alias-map @(:*compiler* bound-vars) ns)
                  r/*data-readers*       (:*data-readers* bound-vars)
                  r/resolve-symbol       resolve-symbol
                  comp/*source-map-data* (:*sm-data* bound-vars)
@@ -801,7 +801,7 @@
               ana/*cljs-static-fns*  (:static-fns opts)
               ana/*fn-invoke-direct* (and (:static-fns opts) (:fn-invoke-direct opts))
               *ns*                   (create-ns (:*cljs-ns* bound-vars))
-              r/*alias-map*          (current-alias-map)
+              r/*alias-map*          (alias-map @(:*compiler* bound-vars) (:*cljs-ns* bound-vars))
               r/*data-readers*       (:*data-readers* bound-vars)
               r/resolve-symbol       resolve-symbol
               comp/*source-map-data* (:*sm-data* bound-vars)]
@@ -916,7 +916,7 @@
                  ana/*cljs-static-fns*  (:static-fns opts)
                  ana/*fn-invoke-direct* (and (:static-fns opts) (:fn-invoke-direct opts))
                  *ns*                   (create-ns ns)
-                 r/*alias-map*          (current-alias-map)
+                 r/*alias-map*          (alias-map @(:*compiler* bound-vars) ns)
                  r/*data-readers*       (:*data-readers* bound-vars)
                  r/resolve-symbol       resolve-symbol
                  comp/*source-map-data* (:*sm-data* bound-vars)]
@@ -1051,7 +1051,7 @@
                  ana/*cljs-static-fns*  (:static-fns opts)
                  ana/*fn-invoke-direct* (and (:static-fns opts) (:fn-invoke-direct opts))
                  *ns*                   (create-ns ns)
-                 r/*alias-map*          (current-alias-map)
+                 r/*alias-map*          (alias-map @(:*compiler* bound-vars) ns)
                  r/*data-readers*       (:*data-readers* bound-vars)
                  r/resolve-symbol       resolve-symbol
                  comp/*source-map-data* (:*sm-data* bound-vars)

src/main/cljs/cljs/pprint.cljs

@@ -3304,22 +3304,21 @@ type-map {"core$future_call" "Future",
    in ks. If ks are not specified, use the keys of the first item in rows."
   {:added "1.3"}
   ([ks rows]
-   (binding [*print-newline*]
-     (when (seq rows)
-       (let [widths (map
-                      (fn [k]
-                        (apply max (count (str k)) (map #(count (str (get % k))) rows)))
-                      ks)
-             spacers (map #(apply str (repeat % "-")) widths)
-             fmt-row (fn [leader divider trailer row]
-                       (str leader
-                            (apply str (interpose divider
-                                                  (for [[col width] (map vector (map #(get row %) ks) widths)]
-                                                    (add-padding width (str col)))))
-                            trailer))]
-         (cljs.core/println)
-         (cljs.core/println (fmt-row "| " " | " " |" (zipmap ks ks)))
-         (cljs.core/println (fmt-row "|-" "-+-" "-|" (zipmap ks spacers)))
-         (doseq [row rows]
-           (cljs.core/println (fmt-row "| " " | " " |" row)))))))
+   (when (seq rows)
+     (let [widths  (map
+                     (fn [k]
+                       (apply max (count (str k)) (map #(count (str (get % k))) rows)))
+                     ks)
+           spacers (map #(apply str (repeat % "-")) widths)
+           fmt-row (fn [leader divider trailer row]
+                     (str leader
+                       (apply str (interpose divider
+                                    (for [[col width] (map vector (map #(get row %) ks) widths)]
+                                      (add-padding width (str col)))))
+                       trailer))]
+       (cljs.core/println)
+       (cljs.core/println (fmt-row "| " " | " " |" (zipmap ks ks)))
+       (cljs.core/println (fmt-row "|-" "-+-" "-|" (zipmap ks spacers)))
+       (doseq [row rows]
+         (cljs.core/println (fmt-row "| " " | " " |" row))))))
   ([rows] (print-table (keys (first rows)) rows)))

src/main/clojure/cljs/core.cljc

@@ -2160,11 +2160,13 @@
   [bindings & body]
   (core/let [names (take-nth 2 bindings)
              vals (take-nth 2 (drop 1 bindings))
-             tempnames (map (comp gensym name) names)
-             binds (map core/vector names vals)
-             resets (reverse (map core/vector names tempnames))
+             orig-val-syms (map (comp gensym #(core/str % "-orig-val__") name) names)
+             temp-val-syms (map (comp gensym #(core/str % "-temp-val__") name) names)
+             binds (map core/vector names temp-val-syms)
+             resets (reverse (map core/vector names orig-val-syms))
              bind-value (core/fn [[k v]] (core/list 'set! k v))]
-    `(let [~@(interleave tempnames names)]
+    `(let [~@(interleave orig-val-syms names)
+           ~@(interleave temp-val-syms vals)]
        ~@(map bind-value binds)
        (try
          ~@body

src/test/cljs/cljs/binding_test.cljs

@@ -19,3 +19,19 @@
   (is (with-redefs [o/bar 2]
         (= o/bar 2)))
   (is (= o/bar 10)))
+
+(def ^:dynamic *a* 1)
+(def ^:dynamic *b* nil)
+
+(deftest test-binding-parallel
+  (is (= 2 (binding [*a* 10
+                     *b* (inc *a*)]
+             *b*))))
+
+(def a 1)
+(def b nil)
+
+(deftest test-redefs-parallel
+  (is (= 2 (with-redefs [a 10
+                         b (inc a)]
+             b))))