Skip to content

Commit

Permalink
[GR-17457] Cleanup after package renames in truffle and graal
Browse files Browse the repository at this point in the history
PullRequest: truffleruby/4032
  • Loading branch information
eregon committed Oct 26, 2023
2 parents bff2e3d + 3f1b436 commit a78212f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ public static boolean isCallBoundary(StackTraceElement element) {
// 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")) &&
return (className.equals("com.oracle.truffle.runtime.OptimizedCallTarget") &&
methodName.equals("executeRootNode")) ||
(className.equals("com.oracle.truffle.api.impl.DefaultCallTarget") &&
methodName.equals("callDirectOrIndirect"));
Expand Down
2 changes: 1 addition & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2260,7 +2260,7 @@ def graph(*args)
raise "The process did not compile #{method}" unless compiled

unless igv
# See org.graalvm.compiler.debug.StandardPathUtilitiesProvider#sanitizeFileName
# See StandardPathUtilitiesProvider#sanitizeFileName in graal
method_glob_pattern = method.gsub(/[ \/\p{Cntrl}]/, '_')
if truffleruby_native?
method_glob_pattern = "{Isolated:_,}#{method_glob_pattern}"
Expand Down

0 comments on commit a78212f

Please sign in to comment.