Use the correct top node for Thread#backtrace_locations

Author: eregon

CHANGELOG.md

@@ -8,6 +8,7 @@ Bug fixes:
 
 * `Range#to_a` wasn't working for `long` ranges (#2198, @tomstuart and @LillianZ).
 * Show the interleaved host and guest stacktrace for host exceptions (#2226).
+* Fix the label of the first location reported by `Thread#backtrace_locations` (#2229).
 
 Compatibility:
 

src/main/java/org/truffleruby/core/thread/ThreadManager.java

@@ -332,7 +332,7 @@ private void rethrowOnMainThread(Node currentNode, RuntimeException e) {
                 "rethrow " + e.getClass() + " to main thread",
                 getRootThread(),
                 currentNode,
-                (rubyThread, actionCurrentNode) -> {
+                (rubyThread, threadCurrentNode) -> {
                     throw e;
                 });
     }

src/main/java/org/truffleruby/core/thread/ThreadNodes.java

@@ -190,9 +190,10 @@ protected Object backtraceLocations(RubyThread rubyThread, int first, int second
         private Object backtraceLocationsInternal(RubyThread rubyThread, int omit, int length) {
             final Memo<Object> backtraceLocationsMemo = new Memo<>(null);
 
-            final SafepointAction safepointAction = (thread1, currentNode) -> {
+            final SafepointAction safepointAction = (thread, currentNode) -> {
                 final Backtrace backtrace = getContext().getCallStack().getBacktrace(this, omit);
-                backtraceLocationsMemo.set(backtrace.getBacktraceLocations(getContext(), getLanguage(), length, this));
+                Object locations = backtrace.getBacktraceLocations(getContext(), getLanguage(), length, currentNode);
+                backtraceLocationsMemo.set(locations);
             };
 
             getContext()
@@ -690,9 +691,9 @@ public static void raiseInThread(RubyLanguage language, RubyContext context, Rub
                     "Thread#raise",
                     rubyThread,
                     currentNode,
-                    (currentThread, currentNode1) -> {
+                    (currentThread, threadCurrentNode) -> {
                         if (exception.backtrace == null) {
-                            exception.backtrace = context.getCallStack().getBacktrace(currentNode1);
+                            exception.backtrace = context.getCallStack().getBacktrace(threadCurrentNode);
                         }
 
                         VMRaiseExceptionNode.reRaiseException(context, exception);

src/main/java/org/truffleruby/language/SafepointManager.java

@@ -320,10 +320,10 @@ public void pauseRubyThreadAndExecute(String reason, RubyThread rubyThread, Node
             // fast path if we are already the right thread
             action.accept(rubyThread, currentNode);
         } else {
-            pauseAllThreadsAndExecute(reason, currentNode, false, (thread, currentNode1) -> {
+            pauseAllThreadsAndExecute(reason, currentNode, false, (thread, threadCurrentNode) -> {
                 if (thread == rubyThread &&
                         threadManager.getRubyFiberFromCurrentJavaThread() == fiberManager.getCurrentFiber()) {
-                    action.accept(thread, currentNode1);
+                    action.accept(thread, threadCurrentNode);
                 }
             });
         }

src/main/java/org/truffleruby/language/objects/ObjectGraph.java

@@ -43,7 +43,7 @@ public static Set<Object> stopAndGetAllObjects(String reason, RubyContext contex
 
         final Thread initiatingJavaThread = Thread.currentThread();
 
-        context.getSafepointManager().pauseAllThreadsAndExecute(reason, currentNode, false, (thread, currentNode1) -> {
+        context.getSafepointManager().pauseAllThreadsAndExecute(reason, currentNode, false, (thread, node) -> {
             synchronized (visited) {
                 final Set<Object> reachable = newObjectSet();
                 // Thread.current
@@ -84,7 +84,7 @@ public static Set<Object> stopAndGetRootObjects(String reason, RubyContext conte
 
         final Thread initiatingJavaThread = Thread.currentThread();
 
-        context.getSafepointManager().pauseAllThreadsAndExecute(reason, currentNode, false, (thread, currentNode1) -> {
+        context.getSafepointManager().pauseAllThreadsAndExecute(reason, currentNode, false, (thread, node) -> {
             synchronized (visited) {
                 visited.add(thread);