[GR-28025] Use InteropLibrary.getExecutableName() instead of RootNode.getName().

PullRequest: graal/7876

Author: entlicher

tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/BuggyLanguageInspectDebugLegacyTest.java

@@ -261,7 +261,9 @@ private void testBuggyCalls(AtomicReference<ProxyLanguage> language, String pref
                         "{\"method\":\"Debugger.scriptParsed\",\"params\":{\"endLine\":" + endLine + ",\"scriptId\":\"1\",\"endColumn\":" + endColumn + ",\"startColumn\":0,\"startLine\":0,\"length\":" +
                                         source.getLength() + ",\"executionContextId\":" + id + ",\"url\":\"" + sourceURI + "\",\"hash\":\"" + hash + "\"}}\n"));
         skipConsoleMessages(tester);
-        assertPaused(prefix + "2", haveScope, haveScope ? 4 : 2, sourceURI, 1);
+        // When we have a buggy scope, getName fails as well because we ask for the root instance,
+        // which is a part of legacy scope.
+        assertPaused(haveScope ? prefix + "2" : "A TruffleException", haveScope, haveScope ? 4 : 2, sourceURI, 1);
         bugVerifier.verifyMessages(tester, 2);
         tester.sendMessage("{\"id\":100,\"method\":\"Debugger.resume\"}");
         assertTrue(tester.compareReceivedMessages(

tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/types/CallFrame.java

@@ -26,6 +26,7 @@
 
 import com.oracle.truffle.tools.utils.json.JSONObject;
 
+import com.oracle.truffle.api.debug.DebugException;
 import com.oracle.truffle.api.debug.DebugStackFrame;
 import com.oracle.truffle.api.debug.SuspendAnchor;
 import com.oracle.truffle.api.source.SourceSection;
@@ -88,7 +89,11 @@ public RemoteObject getReturnValue() {
     private JSONObject createJSON() {
         JSONObject json = new JSONObject();
         json.put("callFrameId", Integer.toString(depth));
-        json.put("functionName", frame.getName());
+        try {
+            json.put("functionName", frame.getName());
+        } catch (DebugException ex) {
+            json.put("functionName", ex.getLocalizedMessage());
+        }
         json.put("location", location.toJSON());
         json.putOpt("functionLocation", (functionLocation != null) ? functionLocation.toJSON() : null);
         json.put("url", url);

truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/DebugStackFrameTest.java

@@ -81,6 +81,7 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
+import java.util.Arrays;
 
 import org.graalvm.polyglot.Source;
 
@@ -337,6 +338,61 @@ public void testAsynchronousStack() {
         expectDone();
     }
 
+    @Test
+    public void testDynamicNames() {
+        TestExecutableNamesLanguage language = new TestExecutableNamesLanguage(0, "staticName", "dynamicName1");
+        ProxyLanguage.setDelegate(language);
+        try (DebuggerSession session = tester.startSession()) {
+            session.suspendNextExecution();
+            Source source = Source.create(ProxyLanguage.ID, "");
+            tester.startEval(source);
+            expectSuspended((SuspendedEvent event) -> {
+                DebugStackFrame frame = event.getTopStackFrame();
+                assertEquals("dynamicName1", frame.getName());
+            });
+        }
+        expectDone();
+    }
+
+    @Test
+    public void testDynamicNamesInDepth() {
+        for (int depth = 0; depth < 5; depth++) {
+            checkDynamicNames(depth, "staticName");
+            checkDynamicNames(depth, "staticName", "dynamicName");
+            checkDynamicNames(depth, "staticName", "dynamicName1", "dynamicName2");
+        }
+    }
+
+    private void checkDynamicNames(int depth, String rootName, String... executableNames) {
+        TestExecutableNamesLanguage language = new TestExecutableNamesLanguage(depth, rootName, executableNames);
+        ProxyLanguage.setDelegate(language);
+        try (DebuggerSession session = tester.startSession()) {
+            session.suspendNextExecution();
+            Source source = Source.create(ProxyLanguage.ID, depth + rootName + Arrays.toString(executableNames));
+            tester.startEval(source);
+            if (executableNames.length == 0) {
+                expectSuspended((SuspendedEvent event) -> {
+                    DebugStackFrame frame = event.getTopStackFrame();
+                    assertEquals("depth = " + depth, rootName, frame.getName());
+                });
+            } else {
+                for (String executableName : executableNames) {
+                    final String name = executableName;
+                    expectSuspended((SuspendedEvent event) -> {
+                        Iterator<DebugStackFrame> framesIterator = event.getStackFrames().iterator();
+                        for (int d = depth; d > 0; d--) {
+                            framesIterator.next();
+                        }
+                        DebugStackFrame frame = framesIterator.next();
+                        assertEquals("depth = " + depth, name, frame.getName());
+                        session.suspendNextExecution();
+                    });
+                }
+            }
+        }
+        expectDone();
+    }
+
     private static SourceSection getFunctionSourceSection(DebugStackFrame frame) {
         // There are only function scopes in the InstrumentationTestLanguage
         assertTrue(frame.getScope().isFunctionScope());