[GR-33934] Use method class's typeName for HostFunction#toDisplayString in case the function represents a static method.

PullRequest: graal/11720

Author: jchalou

truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostAccessTest.java

@@ -54,6 +54,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.math.BigInteger;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.ByteBuffer;
@@ -1946,4 +1947,14 @@ public void testArgAdapterInstantiation() {
             assertEquals(RETURNED_STRING, evalTestLanguage(c, ArgAdapterInstantiationTestLanguage.class, "argument constructor adapter success").asString());
         }
     }
+
+    @Test
+    public void testHostFunctionDisplayName() {
+        try (Context cxt = Context.newBuilder().allowHostAccess(HostAccess.ALL).allowHostClassLookup((s) -> true).build()) {
+            assertEquals(BigInteger.class.getName() + ".valueOf", cxt.asValue(BigInteger.class).getMember("static").getMember("valueOf").toString());
+            assertEquals(Class.class.getName() + ".getName", cxt.asValue(BigInteger.class).getMember("getName").toString());
+            assertEquals(BigInteger.class.getName() + ".add", cxt.asValue(BigInteger.ZERO).getMember("add").toString());
+            assertEquals(int[].class.getName() + ".clone", cxt.asValue(new int[0]).getMember("clone").toString());
+        }
+    }
 }

truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostFunction.java

@@ -103,8 +103,11 @@ String toDisplayString(@SuppressWarnings("unused") boolean allowSideEffects) {
         if (obj == null) {
             return "null";
         }
-        String typeName = obj.getClass().getTypeName();
-        return typeName + "." + method.getName();
+        String declaringClassName = method.getDeclaringClassName();
+        if (declaringClassName == null) {
+            declaringClassName = obj.getClass().getName();
+        }
+        return declaringClassName + "." + method.getName();
     }
 
     @ExportMessage

truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostMethodDesc.java

@@ -64,6 +64,8 @@ abstract class HostMethodDesc {
 
     abstract String getName();
 
+    abstract String getDeclaringClassName();
+
     abstract SingleMethod[] getOverloads();
 
     boolean isInternal() {
@@ -166,6 +168,11 @@ public String getName() {
             return getReflectionMethod().getName();
         }
 
+        @Override
+        String getDeclaringClassName() {
+            return getReflectionMethod().getDeclaringClass().getName();
+        }
+
         @Override
         public SingleMethod[] getOverloads() {
             return new SingleMethod[]{this};
@@ -431,6 +438,11 @@ public String getName() {
                 return "clone";
             }
 
+            @Override
+            String getDeclaringClassName() {
+                return null;
+            }
+
             @Override
             public String toString() {
                 return "Method[clone]";
@@ -476,6 +488,11 @@ public String getName() {
             return getOverloads()[0].getName();
         }
 
+        @Override
+        String getDeclaringClassName() {
+            return getOverloads()[0].getDeclaringClassName();
+        }
+
         @Override
         public boolean isMethod() {
             return getOverloads()[0].isMethod();

truffle/src/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLJavaInteropTest.java

@@ -48,6 +48,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -67,14 +68,20 @@ public class SLJavaInteropTest {
     @Before
     public void create() {
         os = new ByteArrayOutputStream();
-        context = Context.newBuilder().allowHostAccess(HostAccess.ALL).out(os).build();
+        context = Context.newBuilder().allowHostAccess(HostAccess.ALL).allowHostClassLookup((s) -> true).out(os).build();
     }
 
     @After
     public void dispose() {
         context.close();
     }
 
+    @Test
+    public void testHostFunctionDisplayName() {
+        assertEquals(BigInteger.class.getName() + ".valueOf", context.eval("sl", "function main() {\n" + "    return java(\"java.math.BigInteger\").valueOf;\n" + "}\n").toString());
+        assertEquals(BigInteger.class.getName() + ".add", context.eval("sl", "function main() {\n" + "    return java(\"java.math.BigInteger\").ZERO.add;\n" + "}\n").toString());
+    }
+
     @Test
     public void asFunction() throws Exception {
         String scriptText = "function test() {\n" + "    println(\"Called!\");\n" + "}\n";