Skip to content

Commit

Permalink
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/ir/IRBuilder.java
Original file line number Diff line number Diff line change
@@ -1744,6 +1744,7 @@ protected InterpreterContext defineMethodInner(DefNode defNode, IRScope parent,
this.needsCodeCoverage = needsCodeCoverage;

if (RubyInstanceConfig.FULL_TRACE_ENABLED) {
// Explicit line number here because we need a line number for trace before we process any nodes
addInstr(manager.newLineNumber(scope.getLineNumber()));
addInstr(new TraceInstr(RubyEvent.CALL, getName(), getFileName(), scope.getLineNumber()));
}
Original file line number Diff line number Diff line change
@@ -126,7 +126,7 @@ private RubyStackTraceElement[] constructBacktrace(Map<String, Map<String, Strin
case CLASS: newName = "<class:" + rubyFrame.method + '>'; break;
case MODULE: newName = "<module:" + rubyFrame.method + '>'; break;
case METACLASS: newName = "singleton class"; break;
case ROOT: newName = "<top>"; break;
case ROOT: newName = "<main>"; break;
case EVAL: newName = "<eval>"; break;
default: newName = rubyFrame.method;
}
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/JavaNameMangler.java
Original file line number Diff line number Diff line change
@@ -318,7 +318,7 @@ public static String decodeMethodForBacktrace(String methodName) {
final String type = name.get(1); // e.g. RUBY $ class $ methodName
// root body gets named (root)
switch (type) {
case "script": return "<top>";
case "script": return "<main>";
case "metaclass": return "singleton class";
// remaining cases have an encoded name
case "method": return demangleMethodName(name.get(2));

0 comments on commit 44a2aa6

Please sign in to comment.