[GR-47041] Follow OptimizedCallTarget package rename in isCallBoundary()

PullRequest: truffleruby/3898
oracle · Jul 5, 2023 · 67b5614 · 67b5614
2 parents ac66ff8 + 9f79f73
commit 67b5614
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/main/java/org/truffleruby/language/backtrace/BacktraceInterleaver.java b/src/main/java/org/truffleruby/language/backtrace/BacktraceInterleaver.java
@@ -50,11 +50,16 @@ public static List<String> interleave(List<String> rubyBacktrace, StackTraceElem
  return interleaved;
  }
 
+
  public static boolean isCallBoundary(StackTraceElement element) {
- return (element.getClassName().equals("org.graalvm.compiler.truffle.runtime.OptimizedCallTarget") &&
- element.getMethodName().equals("executeRootNode")) ||
- (element.getClassName().equals("com.oracle.truffle.api.impl.DefaultCallTarget") &&
- element.getMethodName().startsWith("call"));
+ // GR-47041: we need com.oracle.truffle.api.impl.Accessor.RuntimeSupport.isGuestCallStackFrame but it's not public
+ String className = element.getClassName();
+ String methodName = element.getMethodName();
+ return ((className.equals("com.oracle.truffle.runtime.OptimizedCallTarget") ||
+ className.equals("org.graalvm.compiler.truffle.runtime.OptimizedCallTarget")) &&
+ methodName.equals("executeRootNode")) ||
+ (className.equals("com.oracle.truffle.api.impl.DefaultCallTarget") &&
+ methodName.equals("callDirectOrIndirect"));
  }
 
  private static boolean isIntoRuby(StackTraceElement[] elements, int index) {