core: sq-symbol qualifies unresolved syms against :compile-ns, not the analyzer's ns
deftype with inline protocol methods failed in compile mode with "Unable to resolve symbol: jolt.analyzer/extend-type". deftype's expander template emits (extend-type ...), but extend-type is defined AFTER deftype in 30-macros — so when the expander compiles at defmacro time, syntax-quote lowering can't resolve it and falls through to current-ns qualification. The analyzer runs interpreted in jolt.analyzer, so ctx-current-ns mid-compile is jolt.analyzer, baking the wrong qualification into the compiled template. Same bug class jolt-265 fixed for resolve-var: read :compile-ns (the namespace being compiled) when set, falling back to ctx-current-ns. Interpret and self-host modes never hit it (interpreted expanders resolve at use time, when extend-type exists) — which is also why no gate test caught it: nothing EVALUATED a deftype-with-inline-methods in compile mode. Two 3-mode conformance cases added. Gate: conformance 271x3, fallback-zero, fixpoint, self-host, sci, staged, suite 4046>=4034, all specs+unit.
This commit is contained in:
parent
dc57052780
commit
1675d88778
2 changed files with 14 additions and 1 deletions
|
|
@ -155,7 +155,15 @@
|
||||||
(special-symbol? nm) form
|
(special-symbol? nm) form
|
||||||
(ns-find (ctx-find-ns ctx "clojure.core") nm)
|
(ns-find (ctx-find-ns ctx "clojure.core") nm)
|
||||||
{:jolt/type :symbol :ns "clojure.core" :name nm}
|
{:jolt/type :symbol :ns "clojure.core" :name nm}
|
||||||
{:jolt/type :symbol :ns (ctx-current-ns ctx) :name nm}))
|
# Unresolved -> qualify to the namespace being COMPILED when set (the
|
||||||
|
# analyzer runs interpreted in jolt.analyzer, so ctx-current-ns is wrong
|
||||||
|
# mid-compile — the same seam resolve-var/h-current-ns use). Matters when
|
||||||
|
# a macro expander's template is lowered while a symbol it references is
|
||||||
|
# not yet defined (deftype's extend-type, defined later in the same tier):
|
||||||
|
# it must qualify to the macro's home ns, not jolt.analyzer.
|
||||||
|
{:jolt/type :symbol
|
||||||
|
:ns (or (get (ctx :env) :compile-ns) (ctx-current-ns ctx))
|
||||||
|
:name nm}))
|
||||||
form))
|
form))
|
||||||
|
|
||||||
(defn- d-realize
|
(defn- d-realize
|
||||||
|
|
|
||||||
|
|
@ -132,6 +132,11 @@
|
||||||
["multimethod default" ":def" "(do (defmulti f identity) (defmethod f :default [x] :def) (f 99))"]
|
["multimethod default" ":def" "(do (defmulti f identity) (defmethod f :default [x] :def) (f 99))"]
|
||||||
["protocol on record" "16" "(do (defprotocol Sh (ar [s])) (defrecord Sq [side] Sh (ar [_] (* side side))) (ar (->Sq 4)))"]
|
["protocol on record" "16" "(do (defprotocol Sh (ar [s])) (defrecord Sq [side] Sh (ar [_] (* side side))) (ar (->Sq 4)))"]
|
||||||
["reify dispatch" "42" "(do (defprotocol P (m [_])) (m (reify P (m [_] 42))))"]
|
["reify dispatch" "42" "(do (defprotocol P (m [_])) (m (reify P (m [_] 42))))"]
|
||||||
|
# deftype with INLINE protocol methods (its expansion calls extend-type, which
|
||||||
|
# is defined AFTER deftype in 30-macros — regression for the sq-symbol
|
||||||
|
# current-ns-vs-compile-ns qualification bug, jolt-3vh)
|
||||||
|
["deftype inline methods" "7" "(do (defprotocol Pi (mi [x])) (deftype Ti [v] Pi (mi [x] v)) (mi (->Ti 7)))"]
|
||||||
|
["deftype two protocols" "[1 2]" "(do (defprotocol Pa (ma [x])) (defprotocol Pb (mb [x])) (deftype Tab [a b] Pa (ma [x] a) Pb (mb [x] b)) (let [t (->Tab 1 2)] [(ma t) (mb t)]))"]
|
||||||
|
|
||||||
### ---- HIGH: aliased namespace calls ----
|
### ---- HIGH: aliased namespace calls ----
|
||||||
["require :as alias" "\"1,2,3\"" "(do (require (quote [clojure.string :as s])) (s/join \",\" [1 2 3]))"]
|
["require :as alias" "\"1,2,3\"" "(do (require (quote [clojure.string :as s])) (s/join \",\" [1 2 3]))"]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue