[GR-20396] Reorganize Backtrace#{getActivations,getBacktraceLocations}.

PullRequest: truffleruby/1257

Author: eregon

src/main/java/org/truffleruby/core/exception/ExceptionNodes.java

@@ -187,7 +187,7 @@ protected Object backtraceLocations(DynamicObject exception,
                 DynamicObject backtraceLocations = Layouts.EXCEPTION.getBacktraceLocations(exception);
                 if (hasLocationsProfile.profile(backtraceLocations == null)) {
                     Backtrace backtrace = Layouts.EXCEPTION.getBacktrace(exception);
-                    backtraceLocations = backtrace.getBacktraceLocations(GetBacktraceException.UNLIMITED);
+                    backtraceLocations = backtrace.getBacktraceLocations(GetBacktraceException.UNLIMITED, null);
                     Layouts.EXCEPTION.setBacktraceLocations(exception, backtraceLocations);
                 }
                 return backtraceLocations;

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -318,16 +318,7 @@ private DynamicObject innerCallerLocations(int omit, int length) {
             // Always skip #caller_locations.
             final int omitted = omit + 1;
             final Backtrace backtrace = getContext().getCallStack().getBacktrace(this, omitted);
-
-            // We can't set an effective limit when dealing with negative range endings.
-            final int limit = length < 0
-                    ? GetBacktraceException.UNLIMITED
-                    : omitted + length;
-
-            // Fill in the stack trace.
-            backtrace.getActivations(new GetBacktraceException(this, limit));
-
-            return backtrace.getBacktraceLocations(length);
+            return backtrace.getBacktraceLocations(length, this);
         }
     }
 

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

@@ -153,30 +153,21 @@ protected DynamicObject backtraceLocations(
 
         @TruffleBoundary
         private DynamicObject backtraceLocationsInternal(DynamicObject rubyThread, int omit, int length) {
-            final Memo<Backtrace> backtraceMemo = new Memo<>(null);
-
-            // We can't set an effective limit when dealing with negative range endings.
-            final int stackTraceElementsLimit = length < 0
-                    ? GetBacktraceException.UNLIMITED
-                    : omit + length;
+            final Memo<DynamicObject> backtraceLocationsMemo = new Memo<>(null);
 
             final SafepointAction safepointAction = (thread1, currentNode) -> {
                 final Backtrace backtrace = getContext().getCallStack().getBacktrace(this, omit);
-                backtraceMemo.set(backtrace);
-                // Fill in the stack trace.
-                backtrace.getActivations(new GetBacktraceException(this, stackTraceElementsLimit));
+                backtraceLocationsMemo.set(backtrace.getBacktraceLocations(length, this));
             };
 
             getContext()
                     .getSafepointManager()
                     .pauseRubyThreadAndExecute(rubyThread, this, safepointAction);
 
             // If the thread is dead or aborting the SafepointAction will not run.
-            if (backtraceMemo.get() == null) {
-                return nil();
-            }
-
-            return backtraceMemo.get().getBacktraceLocations(length);
+            return backtraceLocationsMemo.get() == null
+                    ? nil()
+                    : backtraceLocationsMemo.get();
         }
     }
 

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

@@ -228,16 +228,8 @@ public boolean ignoreFrame(Node callNode, RootCallTarget callTarget) {
             }
         }
 
-        if (rootNode instanceof InternalRootNode) {
-            return true;
-        }
-
-
-        if (callNode.getEncapsulatingSourceSection() == null) {
-            return true;
-        }
+        return rootNode instanceof InternalRootNode || callNode.getEncapsulatingSourceSection() == null;
 
-        return false;
     }
 
 }