Update to Java commit 70880ce (2024.06.11): CLJ-2698: Ignore primitive type return hints in defprotocol

Author: dmiller

Clojure/Clojure.Source/clojure/core_deftype.clj

@@ -687,15 +687,17 @@
             [opts sigs]))
         sigs (when sigs
                (reduce1 (fn [m s]
-                          (let [tag-to-class (fn [tag]
-                                               (if-let [c (and (instance? clojure.lang.Symbol tag)
-                                                            (= (.IndexOf (.Name ^clojure.lang.Symbol tag) ".") -1)                                                              ;;; .indexOf   .getName
-                                                            (not (contains? '#{int long float double char short byte boolean void uint ulong ushort sbyte                       ;;; add unsigned types
-                                                                               ints longs floats doubles chars shorts bytes booleans objects uints ulongs ushorts sbytes} tag))
-                                                            (resolve tag))]
-                                                 (symbol (.FullName c))                             ;;; .getName 
-                                                 tag))
-                                name-meta (update-in (meta (first s)) [:tag] tag-to-class)
+                          (let [disallowed? '#{int long float double char short byte boolean void uint ulong ushort sbyte}                           ;;; Added unsigned types
+                                array-tag? '#{ints longs floats doubles chars shorts bytes booleans objects uints ulongs ushorts sbytes}             ;;; Added unsigned types
+                                resolve-class-symbol (fn [tag]
+                                                       (when-not (disallowed? tag)
+                                                         (if-let [c (and (instance? clojure.lang.Symbol tag)
+                                                                         (= (.IndexOf (.Name ^clojure.lang.Symbol tag) ".") -1)                       ;;; .indexOf   .getName
+                                                                         (not (array-tag? tag))
+                                                                         (resolve tag))]
+                                                           (symbol (.FullName c))                                                                     ;;; .getName
+                                                           tag)))
+                                name-meta (update-in (meta (first s)) [:tag] resolve-class-symbol)
                                 mname (with-meta (first s) nil)
                                 [arglists doc]
                                 (loop [as [] rs (rest s)]

Clojure/Clojure.Tests/clojure/test_clojure/protocols.clj

@@ -705,4 +705,19 @@
 (extend-protocol clojure.test-clojure.protocols/P String
   (f [s] (seq s)))
 (deftest test-resolve-type-hints-in-protocol-methods
-  (is (= 4 (clojure.test-clojure.protocols/f "test"))))
+  (is (= 4 (clojure.test-clojure.protocols/f "test"))))
+
+
+;; CLJ-2698 - Ignore primitive hints in defprotocol return
+
+(defprotocol PrimHinted
+  (^double f1 [p a])
+  (^void f2 [p]))
+
+(deftest test-prim-ret-hints-ignored
+  (is (thrown-with-msg?
+       Exception
+       #"Receiver class"
+       (eval '(f1 (reify PrimHinted) :foo))))
+  (is (= :foo  (f1 (reify PrimHinted (f1 [_ x] x)) :foo)))
+  (is (= "foo" (f2 (reify PrimHinted (f2 [_] "foo"))))))