CLJS-2025: Self-host: spec tests fail

Author: anmonteiro

src/main/cljs/cljs/js.cljs

@@ -179,7 +179,7 @@
   []
   (->> (merge (get-in @env/*compiler* [::ana/namespaces ana/*cljs-ns* :requires])
          (get-in @env/*compiler* [::ana/namespaces ana/*cljs-ns* :require-macros]))
-    (remove (fn [[k v]] (= k v)))
+    (remove (fn [[k v]] (symbol-identical? k v)))
     (into {})))
 
 ;; -----------------------------------------------------------------------------
@@ -457,6 +457,19 @@
       (update :renames rewrite-renames)
       (update :rename-macros rewrite-renames))))
 
+(defn- check-macro-autoload-inferring-missing
+  [{:keys [requires name] :as ast} cenv]
+  (let [namespaces (-> @cenv ::ana/namespaces)
+        missing-require-macros (into {}
+                                 (filter (fn [[_ full-ns]]
+                                           (let [{:keys [use-macros require-macros]} (get namespaces full-ns)]
+                                             (or (some #{full-ns} (vals use-macros))
+                                                 (some #{full-ns} (vals require-macros))))))
+                                 requires)
+        ast' (update-in ast [:require-macros] merge missing-require-macros)]
+    (swap! cenv update-in [::ana/namespaces name :require-macros] merge missing-require-macros)
+    ast'))
+
 (defn- ns-side-effects
   ([bound-vars ana-env ast opts cb]
     (ns-side-effects false bound-vars ana-env ast opts cb))
@@ -498,7 +511,8 @@
                                                      env/*compiler* (:*compiler* bound-vars)]
                                              (let [ast' (-> rewritten-ast
                                                           (ana/check-use-macros-inferring-missing env)
-                                                          (ana/check-rename-macros-inferring-missing env))]
+                                                          (ana/check-rename-macros-inferring-missing env)
+                                                          (check-macro-autoload-inferring-missing env))]
                                                (cb {:value ast'})))
                                            (catch :default cause
                                              (cb (wrap-error

src/main/cljs/cljs/spec/alpha.cljc

@@ -36,12 +36,19 @@
 (defn- res [env form]
   (cond
     (keyword? form) form
-    (symbol? form) (clojure.core/or (->> form (resolve env) ->sym) form)
+    (symbol? form) #?(:clj  (clojure.core/or (->> form (resolve env) ->sym) form)
+                      :cljs (let [resolved (clojure.core/or (->> form (resolve env) ->sym) form)
+                                  ns-name (namespace resolved)]
+                              (symbol
+                                (if (clojure.core/and ns-name (str/ends-with? ns-name "$macros"))
+                                  (subs ns-name 0 (- (count ns-name) 7))
+                                  ns-name)
+                                (name resolved))))
     (sequential? form) (walk/postwalk #(if (symbol? %) (res env %) %) (unfn form))
     :else form))
 
 (defmacro ^:private mres
-  "a compile time res, for use in cljs/spec.cljs"
+  "a compile time res, for use in cljs/spec/alpha.cljs"
   [form]
   (res &env form))
 

src/main/clojure/cljs/analyzer.cljc

@@ -968,8 +968,12 @@
       (some? (namespace sym))
       (let [ns (namespace sym)
             ns (if (= "clojure.core" ns) "cljs.core" ns)
-            full-ns (resolve-macro-ns-alias env ns)]
-        (get-in namespaces [full-ns :macros (symbol (name sym))]))
+            full-ns (resolve-macro-ns-alias env ns)
+            #?@(:cljs [full-ns (if-not (string/ends-with? (str full-ns) "$macros")
+                                 (symbol (str full-ns "$macros"))
+                                 full-ns)])]
+        #?(:clj (get-in namespaces [full-ns :macros (symbol (name sym))])
+           :cljs (get-in namespaces [full-ns :defs (symbol (name sym))])))
 
       (some? (get-in namespaces [ns :use-macros sym]))
       (let [full-ns (get-in namespaces [ns :use-macros sym])]
@@ -2865,7 +2869,7 @@
                  env)
           ret  {:env env :form sym}
           lcls (:locals env)]
-      (if-some [lb (get lcls sym)] 
+      (if-some [lb (get lcls sym)]
         (assoc ret :op :var :info lb)
         (let [sym-meta (meta sym)
               sym-ns (namespace sym)