Skip to content

Commit 0525655

Browse files
mfikesswannodette
authored andcommitted
CLJS-2671: Double analysis warning for source in JAR with AOT cache
1 parent 196e88e commit 0525655

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

src/main/clojure/cljs/compiler.cljc

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,11 +1442,11 @@
14421442

14431443
#?(:clj
14441444
(defn compile-file*
1445-
([src dest]
1445+
([^File src ^File dest]
14461446
(compile-file* src dest
14471447
(when env/*compiler*
14481448
(:options @env/*compiler*))))
1449-
([src dest opts]
1449+
([^File src ^File dest opts]
14501450
(ensure
14511451
(with-core-cljs opts
14521452
(fn []
@@ -1459,11 +1459,12 @@
14591459
(let [ext (util/ext src)
14601460
{:keys [ns] :as ns-info} (ana/parse-ns src)]
14611461
(if-let [cached (cached-core ns ext opts)]
1462-
(emit-cached-core src dest cached opts)
1462+
[(emit-cached-core src dest cached opts) false]
14631463
(let [opts (if (macro-ns? ns ext opts)
14641464
(assoc opts :macros-ns true)
14651465
opts)
1466-
ret (emit-source src dest ext opts)]
1466+
dest-exists? (.exists dest)
1467+
ret [(emit-source src dest ext opts) dest-exists?]]
14671468
(.setLastModified ^File dest (util/last-modified src))
14681469
ret))))))))))
14691470

@@ -1545,8 +1546,9 @@
15451546
(not= 'cljs.core ns)
15461547
(not= :interactive (:mode opts)))
15471548
(swap! env/*compiler* update-in [::ana/namespaces] dissoc ns))
1548-
(let [ret (compile-file* src-file dest-file opts)]
1549-
(when *recompiled*
1549+
(let [[ret recompiled?] (compile-file* src-file dest-file opts)]
1550+
(when (and *recompiled*
1551+
recompiled?)
15501552
(swap! *recompiled* conj ns))
15511553
ret))
15521554
(do

0 commit comments

Comments
 (0)