Merge pull request #113 from clojure/cljs-3341/windows-loader-test-overflow

CLJS-3341: Windows loader test failing with StackOverflow

Author: swannodette

src/main/clojure/cljs/compiler.cljc

@@ -1618,11 +1618,11 @@
                              {:ns         (or ns-name 'cljs.user)
                               :macros-ns  (:macros-ns opts)
                               :provides   [ns-name]
-                              :requires   (cond-> (distinct deps)
-                                            (get-in @env/*compiler* [:options :emit-constants])
-                                            (conj ana/constants-ns-sym)
-                                            (not= ns-name 'cljs.core)
-                                            (conj 'cljs.core))
+                              :requires   (if (= ns-name 'cljs.core)
+                                            (vec (distinct deps))
+                                            (cond-> (conj (vec (distinct deps)) 'cljs.core)
+                                              (get-in @env/*compiler* [:options :emit-constants])
+                                              (conj ana/constants-ns-sym)))
                               :file        dest
                               :out-file    (.toString ^File dest)
                               :source-file src}

src/main/clojure/cljs/module_graph.cljc

@@ -148,8 +148,13 @@
   "Return all dependencies for x in a graph using deps-key."
   [x graph deps-key]
   (let [requires (get-in graph [x deps-key])]
-    (-> (mapcat #(deps-for % graph deps-key) requires)
-      (concat requires) distinct vec)))
+    (try
+      (-> (mapcat #(deps-for % graph deps-key) requires)
+        (concat requires) distinct vec)
+      (catch Throwable t
+        (throw
+          (ex-info (str "Failed to compute deps for " x)
+            {:lib x :requires requires} t))))))
 
 (defn deps-for-entry
   "Return all dependencies for an entry using a compiler inputs index."