CLJ-2867: Convey tag on QME whenever it's present.

fogus · puredanger · commit 8c8e4f6ef21f · 2024-07-03T13:25:13.000-05:00
diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
@@ -1164,6 +1164,7 @@ static class QualifiedMethodExpr implements Expr {
 	private final Symbol methodSymbol;
 	private final String methodName;
 	private final MethodKind kind;
+	private final Class tagClass;
 
 	private enum MethodKind {
 		CTOR, INSTANCE, STATIC
@@ -1172,6 +1173,7 @@ private enum MethodKind {
 	public QualifiedMethodExpr(Class methodClass, Symbol sym){
 		c = methodClass;
 		methodSymbol = sym;
+		tagClass = tagOf(sym) != null ? HostExpr.tagToClass(tagOf(sym)) : AFn.class;
 		hintedSig = tagsToClasses(paramTagsOf(sym));
 		if(sym.name.startsWith(".")) {
 			kind = MethodKind.INSTANCE;
@@ -1208,7 +1210,7 @@ public boolean hasJavaClass() {
 
 	@Override
 	public Class getJavaClass() {
-		return AFn.class;
+		return tagClass;
 	}
 
 	// TBD: caching/reuse of thunks
diff --git a/test/clojure/test_clojure/method_thunks.clj b/test/clojure/test_clojure/method_thunks.clj
@@ -9,8 +9,10 @@
 
 (ns clojure.test-clojure.method-thunks
   (:use clojure.test)
+  (:require [clojure.java.io :as jio])
   (:import (clojure.lang Compiler Tuple)
            (java.util Arrays UUID Locale)
+           (java.io File FileFilter)
            clojure.lang.IFn$LL))
 
 (set! *warn-on-reflection* true)
@@ -52,3 +54,9 @@
          ((:fromString mts) "00000000-0000-0001-0000-000000000002")))
   (is (= [1] (mt 1)))
   (is (= 97 (first (seq (gbs "a"))))))
+
+(deftest hinted-method-values
+  (is (thrown? Exception (eval '(.listFiles (jio/file ".") #(File/.isDirectory %)))))
+  (is (seq (.listFiles (jio/file ".") ^FileFilter File/.isDirectory)))
+  (is (seq (File/.listFiles (jio/file ".") ^FileFilter File/.isDirectory)))
+  (is (seq (^[FileFilter] File/.listFiles (jio/file ".") ^FileFilter File/.isDirectory))))
