Fixes #5164. Thread::Backtrace::Location#label inside eval does not r…

…eturn enclosing method name. This one is pretty weird. I just switched to method.name from <eval> and the test ran fine. I noticed that top-level evals were not printing out <main>, so I tweaked a few things. JIT will apparently set frame method name to '' vs null so I am not sure what is up there. # Conflicts: # core/src/main/java/org/jruby/ir/interpreter/Interpreter.java
jruby · Jun 14, 2018 · 6bdc55f · 6bdc55f
1 parent 3b448cc
commit 6bdc55f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/ir/interpreter/Interpreter.java b/core/src/main/java/org/jruby/ir/interpreter/Interpreter.java
@@ -33,7 +33,8 @@
 
 public class Interpreter extends IRTranslator<IRubyObject, IRubyObject> {
     public static final Logger LOG = LoggerFactory.getLogger(Interpreter.class);
-    public static final String ROOT = "(root)";
+    public static final String ROOT = "<main>";
+
     static int interpInstrsCount = 0;
 
     public static void dumpStats() {

diff --git a/core/src/main/java/org/jruby/runtime/backtrace/BacktraceData.java b/core/src/main/java/org/jruby/runtime/backtrace/BacktraceData.java
@@ -133,7 +133,9 @@ private RubyStackTraceElement[] constructBacktrace(Map<String, Map<String, Strin
                     case MODULE: newName = "<module:" + rubyFrame.method + '>'; break;
                     case METACLASS: newName = "singleton class"; break;
                     case ROOT: newName = "<main>"; break;
-                    case EVAL: newName = "<eval>"; break;
+                    case EVAL:
+                        newName = rubyFrame.method == null || rubyFrame.method.isEmpty() ? "<main>" : rubyFrame.method;
+                        break;
                     default: newName = rubyFrame.method;
                 }
                 RubyStackTraceElement rubyElement = new RubyStackTraceElement("RUBY", newName, rubyFrame.filename, rubyFrame.line + 1, false, frameType);