Skip to content

Commit 6097d1c

Browse files
author
dnolen
committed
CLJS-1119: constant table emission logic is incorrect
move constant table emission after dependencies are compiled
1 parent 6f9fca5 commit 6097d1c

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

src/clj/cljs/closure.clj

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,23 +1407,21 @@ should contain the source for the given namespace name."
14071407
(let [compiled (util/measure compiler-stats
14081408
"Compile basic sources"
14091409
(doall (-compile source all-opts)))
1410-
;; the constants_table.js file is not used directly here, is picked up by
1411-
;; add-dependencies below
1412-
_ (when emit-constants
1413-
(comp/emit-constants-table-to-file
1414-
(::ana/constant-table @env/*compiler*)
1415-
(str (util/output-directory all-opts) "/constants_table.js")))
14161410
js-sources (util/measure compiler-stats
14171411
"Add dependencies"
14181412
(doall
14191413
(concat
1420-
(apply add-dependencies all-opts
1421-
(concat
1422-
(if (coll? compiled) compiled [compiled])
1423-
(when (= :nodejs (:target all-opts))
1424-
[(-compile (io/resource "cljs/nodejs.cljs") all-opts)])))
1425-
(when (= :nodejs (:target all-opts))
1426-
[(-compile (io/resource "cljs/nodejscli.cljs") all-opts)]))))
1414+
(apply add-dependencies all-opts
1415+
(concat
1416+
(if (coll? compiled) compiled [compiled])
1417+
(when (= :nodejs (:target all-opts))
1418+
[(-compile (io/resource "cljs/nodejs.cljs") all-opts)])))
1419+
(when (= :nodejs (:target all-opts))
1420+
[(-compile (io/resource "cljs/nodejscli.cljs") all-opts)]))))
1421+
_ (when emit-constants
1422+
(comp/emit-constants-table-to-file
1423+
(::ana/constant-table @env/*compiler*)
1424+
(str (util/output-directory all-opts) "/constants_table.js")))
14271425
optim (:optimizations all-opts)
14281426
ret (if (and optim (not= optim :none))
14291427
(do

0 commit comments

Comments
 (0)