CLJS-1871: A declare with :arglists should generate static function calls

Author: mfikes

src/main/cljs/cljs/js.cljs

@@ -194,7 +194,7 @@
 ;; -----------------------------------------------------------------------------
 ;; Analyze
 
-(declare eval-str*)
+(declare ^{:arglists '([bound-vars source name opts cb])} eval-str*)
 
 (def *loaded* (atom #{}))
 
@@ -217,7 +217,10 @@
           (run-async! proc (rest coll) break? cb))))
     (cb nil)))
 
-(declare require)
+(declare ^{:arglists '([name cb]
+                       [name opts cb]
+                       [bound-vars name opts cb]
+                       [bound-vars name reload opts cb])} require)
 
 (defn- process-deps
   [bound-vars names opts cb]
@@ -426,7 +429,7 @@
                      (cb res))))))
            (cb {:value nil})))))))
 
-(declare analyze-str*)
+(declare ^{:arglists '([bound-vars source name opts cb])} analyze-str*)
 
 (defn- analyze-deps
   ([bound-vars ana-env lib deps cb]
@@ -786,7 +789,7 @@
 ;; -----------------------------------------------------------------------------
 ;; Eval
 
-(declare clear-fns!)
+(declare ^{:arglists '([])} clear-fns!)
 
 (defn- eval* [bound-vars form opts cb]
   (let [the-ns     (or (:ns opts) 'cljs.user)

src/main/cljs/cljs/pprint.cljs

@@ -221,7 +221,7 @@ beginning of aseq"
 ;; Forward declarations
 ;;======================================================================
 
-(declare get-miser-width)
+(declare ^{:arglists '([this])} get-miser-width)
 
 ;;======================================================================
 ;; The data structures used by pretty-writer
@@ -687,7 +687,7 @@ radix specifier is in the form #XXr where XX is the decimal value of *print-base
 ;; Support for the write function
 ;;======================================================================
 
-(declare format-simple-number)
+(declare ^{:arglists '([n])} format-simple-number)
 
 ;; This map causes var metadata to be included in the compiled output, even
 ;; in advanced compilation. See CLJS-1853 - António Monteiro
@@ -887,9 +887,9 @@ THIS FUNCTION IS NOT YET IMPLEMENTED."
 ;;======================================================================
 
 ;; Forward references
-(declare compile-format)
-(declare execute-format)
-(declare init-navigator)
+(declare ^{:arglists '([format-str])} compile-format)
+(declare ^{:arglists '([stream format args] [format args])} execute-format)
+(declare ^{:arglists '([s])} init-navigator)
 ;; End forward references
 
 (defn cl-format
@@ -1026,7 +1026,7 @@ http://www.lispworks.com/documentation/HyperSpec/Body/22_c.htm"
 ;; Common handling code for ~A and ~S
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(declare opt-base-str)
+(declare ^{:arglists '([base val])} opt-base-str)
 
 (def ^{:private true}
   special-radix-markers {2 "#b" 8 "#o" 16 "#x"})
@@ -1832,8 +1832,8 @@ http://www.lispworks.com/documentation/HyperSpec/Body/22_c.htm"
 ;; TODO: make it possible to make these decisions at compile-time.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(declare format-logical-block)
-(declare justify-clauses)
+(declare ^{:arglists '([params navigator offsets])} format-logical-block)
+(declare ^{:arglists '([params navigator offsets])} justify-clauses)
 
 (defn- logical-block-or-justify [params navigator offsets]
   (if (:colon (:right-params params))
@@ -2572,7 +2572,7 @@ of parameters as well."
   (and (:separator (:bracket-info (:def this)))
        (:colon (:params this))))
 
-(declare collect-clauses)
+(declare ^{:arglists '([bracket-info offset remainder])} collect-clauses)
 
 (defn- process-bracket [this remainder]
   (let [[subex remainder] (collect-clauses (:bracket-info (:def this))
@@ -2918,7 +2918,7 @@ type-map {"core$future_call" "Future",
 ;;; Dispatch for the code table
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(declare pprint-simple-code-list)
+(declare ^{:arglists '([alis])} pprint-simple-code-list)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Format the namespace ("ns") macro. This is quite complicated because of all the

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

@@ -99,8 +99,8 @@
    (implements? IMeta spec)
    (-> (meta spec) ::name)))
 
-(declare spec-impl)
-(declare regex-spec-impl)
+(declare ^{:arglists '([form pred gfn cpred?] [form pred gfn cpred? unc])} spec-impl)
+(declare ^{:arglists '([re gfn])} regex-spec-impl)
 
 (defn- maybe-spec
   "spec-or-k must be a spec, regex or resolvable kw/sym, else returns nil."
@@ -264,7 +264,7 @@
   [spec x]
   (with-out-str (explain spec x)))
 
-(declare valid?)
+(declare ^{:arglists '([spec x] [spec x form])} valid?)
 
 (defn- gensub
   [spec overrides path rmap form]
@@ -1004,7 +1004,7 @@
                (empty? pret))
         nil))
 
-(declare preturn)
+(declare ^{:arglists '([p])} preturn)
 
 (defn- accept-nil? [p]
   (let [{:keys [::op ps p1 p2 forms] :as p} (reg-resolve! p)]
@@ -1019,7 +1019,7 @@
       ::pcat (every? accept-nil? ps)
       ::alt (c/some accept-nil? ps))))
 
-(declare add-ret)
+(declare ^{:arglists '([p r k])} add-ret)
 
 (defn- preturn [p]
   (let [{[p0 & pr :as ps] :ps, [k :as ks] :ks, :keys [::op p1 ret forms] :as p} (reg-resolve! p)]

src/main/cljs/clojure/data.cljs

@@ -12,7 +12,7 @@
   clojure.data
   (:require [clojure.set :as set]))
 
-(declare diff)
+(declare ^{:arglists '([a b])} diff)
 
 (defn- atom-diff
   "Internal helper for diff."

src/main/clojure/cljs/analyzer.cljc

@@ -131,6 +131,7 @@
    :fn-var true
    :fn-arity true
    :fn-deprecated true
+   :declared-arglists-mismatch true
    :protocol-deprecated true
    :undeclared-protocol-symbol true
    :invalid-protocol-symbol true
@@ -347,6 +348,12 @@
   [warning-type info]
   (str (-> info :fexpr :info :name) " is deprecated"))
 
+(defmethod error-message :declared-arglists-mismatch
+  [warning-type info]
+  (str (symbol (str (:ns-name info)) (str (:sym info)))
+    " declared arglists " (:declared info)
+    " mismatch defined arglists " (:defined info)))
+
 (defmethod error-message :undeclared-ns-form
   [warning-type info]
   (str "Invalid :refer, " (:type info) " " (:lib info) "/" (:sym info) " does not exist"))
@@ -1527,7 +1534,13 @@
                  (not (:declared sym-meta))
                  *file-defs*
                  (get @*file-defs* sym))
-        (warning :redef-in-file env {:sym sym :line (:line v)})))
+        (warning :redef-in-file env {:sym sym :line (:line v)}))
+      (when (and (:declared v)
+                 (:arglists v)
+                 (not= (:arglists v) (:arglists sym-meta)))
+        (warning :declared-arglists-mismatch env {:ns-name  ns-name :sym sym
+                                                  :declared (second (:arglists v))
+                                                  :defined  (second (:arglists sym-meta))})))
     (let [env (if (or (and (not= ns-name 'cljs.core)
                            (core-name? env sym))
                       (some? (get-in @env/*compiler* [::namespaces ns-name :uses sym])))
@@ -1617,6 +1630,11 @@
                      :method-params params
                      :arglists (:arglists sym-meta)
                      :arglists-meta (doall (map meta (:arglists sym-meta)))}))))
+            (when (and (:declared sym-meta)
+                       (:arglists sym-meta))
+              {:declared true
+               :fn-var true
+               :method-params (second (:arglists sym-meta))})
             (if (and fn-var? (some? tag))
               {:ret-tag tag}
               (when tag {:tag tag})))))

src/test/cljs/cljs/invoke_test.cljs

@@ -30,3 +30,7 @@
 (gstr/urlEncode "foo")
 
 (js/goog.string.urlDecode "bar")
+
+(declare ^{:arglists '([a b])} declared-fn)
+
+(declared-fn 1 2)

src/test/clojure/cljs/analyzer_tests.clj

@@ -712,6 +712,16 @@
                            z)))))
               :tag meta :prefix))))
 
+(deftest test-cljs-1871
+  (let [ws (atom [])]
+    (try
+      (a/with-warning-handlers [(collecting-warning-handler ws)]
+        (a/analyze (ana/empty-env)
+          '(do (declare ^{:arglists '([x y])} foo)
+               (defn foo [x]))))
+      (catch Exception _))
+    (is (string/includes? (first @ws) "declared arglists ([x y]) mismatch defined arglists ([x])"))))
+
 (deftest test-cljs-2023
   (let [form (with-meta 'js/goog.DEBUG {:tag 'boolean})]
     (is (= (-> (ana-api/analyze (a/empty-env) form) :tag) 'boolean))))

src/test/clojure/cljs/compiler_tests.clj

@@ -266,7 +266,9 @@
       (is (re-find #"(?m)^.*var fexpr.*=.*cljs.core.complement\(funexpr1\);$"
                    content))
       (is (re-find #"(?m)^.*var .*=.*inv_arg1.cljs.core.IFn._invoke.arity.0 \?.*$"
-                   content)))))
+                   content))
+      ;; CLJS-1871: A declare hinted with :arglists meta should result in static dispatch
+      (is (str/includes? content "cljs.invoke_test.declared_fn(")))))
 #_(test-vars [#'test-optimized-invoke-emit])
 
 ;; CLJS-1225