CLJS-2414: Self-host: Macro specs are instrumented

Author: mfikes

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

@@ -35,7 +35,8 @@
 (defmacro instrument-1
   [[quote s] opts]
   (when-let [v (ana-api/resolve &env s)]
-    (when (nil? (:const v))
+    (when (and (nil? (:const v))
+               #?(:cljs (nil? (:macro v))))
       (swap! instrumented-vars conj (:name v))
       `(let [checked# (instrument-1* '~s (var ~s) ~opts)]
          (when checked# (set! ~s checked#))

src/test/cljs/cljs/spec/test/test_macros.cljc

@@ -0,0 +1,10 @@
+(ns cljs.spec.test.test-macros
+  #?(:cljs (:require [cljs.spec.alpha :as s])))
+
+(defmacro add
+  [a b]
+  `(+ ~a ~b))
+
+#?(:cljs
+   (s/fdef add
+     :args (s/cat :a number? :b number?)))

src/test/cljs/cljs/spec/test_test.cljs

@@ -1,4 +1,5 @@
 (ns cljs.spec.test-test
+  (:require-macros [cljs.spec.test.test-macros])
   (:require [cljs.test :as test :refer-macros [deftest is are run-tests]]
             [cljs.spec.alpha :as s]
             [cljs.spec.test.alpha :as stest]))
@@ -37,3 +38,6 @@
 (deftest test-cljs-2391-c
   (stest/unstrument `f-2391)
   (is (= 1 (f-2391))))
+
+(deftest test-cljs-2414
+  (is (empty? (stest/instrument 'cljs.spec.test.test-macros$macros/add))))