Frame name for module/class bodies should be null

headius · headius · commit 4302ab9b71da · 2024-03-28T17:22:01.000-05:00
There's no super and __method__ should return nil inside module
and class bodies, so we pass null to indicate this.
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRBodyMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRBodyMethod.java
@@ -71,7 +71,7 @@ private IRubyObject INTERPRET_CLASS(InterpreterContext ic, ThreadContext context
     private IRubyObject interpretWithBacktrace(InterpreterContext ic, ThreadContext context, IRubyObject self, String name, Block block) {
         try {
             ThreadContext.pushBacktrace(context, name, ic.getFileName(), ic.getLine());
-            return ic.getEngine().interpret(context, null, self, ic, getImplementationClass().getMethodLocation(), name, block);
+            return ic.getEngine().interpret(context, null, self, ic, getImplementationClass().getMethodLocation(), null, block);
         } finally {
             ThreadContext.popBacktrace(context);
         }
diff --git a/core/src/main/java/org/jruby/ir/instructions/DefineClassInstr.java b/core/src/main/java/org/jruby/ir/instructions/DefineClassInstr.java
@@ -86,7 +86,7 @@ private IRubyObject INTERPRET_CLASS(ThreadContext context, RubyModule clazz) {
 
         try {
             ThreadContext.pushBacktrace(context, id, ic.getFileName(), ic.getLine());
-            return ic.getEngine().interpret(context, null, clazz, ic, clazz.getMethodLocation(), id, Block.NULL_BLOCK);
+            return ic.getEngine().interpret(context, null, clazz, ic, clazz.getMethodLocation(), null, Block.NULL_BLOCK);
         } finally {
             body.cleanupAfterExecution();
             if (!hasExplicitCallProtocol) post(ic, context);
diff --git a/core/src/main/java/org/jruby/ir/instructions/DefineModuleInstr.java b/core/src/main/java/org/jruby/ir/instructions/DefineModuleInstr.java
@@ -77,7 +77,7 @@ private IRubyObject INTERPRET_MODULE(ThreadContext context, RubyModule clazz) {
 
         try {
             ThreadContext.pushBacktrace(context, id, ic.getFileName(), ic.getLine());
-            return ic.getEngine().interpret(context, null, clazz, ic, clazz.getMethodLocation(), id, Block.NULL_BLOCK);
+            return ic.getEngine().interpret(context, null, clazz, ic, clazz.getMethodLocation(), null, Block.NULL_BLOCK);
         } finally {
             body.cleanupAfterExecution();
             if (!hasExplicitCallProtocol) post(ic, context);
diff --git a/core/src/main/java/org/jruby/ir/instructions/FrameNameCallInstr.java b/core/src/main/java/org/jruby/ir/instructions/FrameNameCallInstr.java
@@ -56,6 +56,8 @@ public IRubyObject getFrameName(ThreadContext context, IRubyObject self, String
             return frameNameSite.call(context, self, self);
         }
 
+        if (compositeName == null) return context.nil;
+
         return callee ?
                 RubySymbol.newCalleeSymbolFromCompound(context.runtime, compositeName):
                 RubySymbol.newMethodSymbolFromCompound(context.runtime, compositeName);
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -1964,7 +1964,7 @@ public static void defCompiledInstanceMethod(ThreadContext context, MethodHandle
     public static IRubyObject invokeModuleBody(ThreadContext context, DynamicMethod method) {
         RubyModule implClass = method.getImplementationClass();
 
-        return method.call(context, implClass, implClass, "", Block.NULL_BLOCK);
+        return method.call(context, implClass, implClass, null, Block.NULL_BLOCK);
     }
 
     @JIT
diff --git a/core/src/main/java/org/jruby/ir/targets/indy/FrameNameSite.java b/core/src/main/java/org/jruby/ir/targets/indy/FrameNameSite.java
@@ -1,6 +1,7 @@
 package org.jruby.ir.targets.indy;
 
 import com.headius.invokebinder.Binder;
+import org.jruby.RubyNil;
 import org.jruby.RubySymbol;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
@@ -58,7 +59,7 @@ public IRubyObject frameNameFallback(String name, ThreadContext context, IRubyOb
         if (entry.method.isBuiltin()) {
             target = Binder.from(type())
                     .permute(2)
-                    .append(context.runtime.getSymbolTable())
+                    .append(context.runtime.getSymbolTable(), context.nil)
                     .prepend(this)
                     .invokeVirtualQuiet(methodName);
         } else {
@@ -72,14 +73,18 @@ public IRubyObject frameNameFallback(String name, ThreadContext context, IRubyOb
         return (IRubyObject) target.invokeExact(context, self, frameName);
     }
 
-    public IRubyObject __callee__(String frameName, RubySymbol.SymbolTable symbolTable) {
+    public IRubyObject __callee__(String frameName, RubySymbol.SymbolTable symbolTable, RubyNil nil) {
+        if (frameName == null) return nil;
+
         if (frameName.charAt(0) != '\0') {
             return getSimpleName(frameName, symbolTable);
         }
         return symbolTable.getCalleeSymbolFromCompound(frameName);
     }
 
-    public IRubyObject __method__(String frameName, RubySymbol.SymbolTable symbolTable) {
+    public IRubyObject __method__(String frameName, RubySymbol.SymbolTable symbolTable, RubyNil nil) {
+        if (frameName == null) return nil;
+
         if (frameName.charAt(0) != '\0') {
             return getSimpleName(frameName, symbolTable);
         }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private IRubyObject INTERPRET_CLASS(InterpreterContext ic, ThreadContext context`
`71`	`71`	`private IRubyObject interpretWithBacktrace(InterpreterContext ic, ThreadContext context, IRubyObject self, String name, Block block) {`
`72`	`72`	`try {`
`73`	`73`	`ThreadContext.pushBacktrace(context, name, ic.getFileName(), ic.getLine());`
`74`		`- return ic.getEngine().interpret(context, null, self, ic, getImplementationClass().getMethodLocation(), name, block);`
	`74`	`+ return ic.getEngine().interpret(context, null, self, ic, getImplementationClass().getMethodLocation(), null, block);`
`75`	`75`	`} finally {`
`76`	`76`	`ThreadContext.popBacktrace(context);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ public IRubyObject getFrameName(ThreadContext context, IRubyObject self, String`
`56`	`56`	`return frameNameSite.call(context, self, self);`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ if (compositeName == null) return context.nil;`
	`60`	`+`
`59`	`61`	`return callee ?`
`60`	`62`	`RubySymbol.newCalleeSymbolFromCompound(context.runtime, compositeName):`
`61`	`63`	`RubySymbol.newMethodSymbolFromCompound(context.runtime, compositeName);`
Original file line number	Diff line number	Diff line change
`@@ -1964,7 +1964,7 @@ public static void defCompiledInstanceMethod(ThreadContext context, MethodHandle`
`1964`	`1964`	`public static IRubyObject invokeModuleBody(ThreadContext context, DynamicMethod method) {`
`1965`	`1965`	`RubyModule implClass = method.getImplementationClass();`
`1966`	`1966`
`1967`		`- return method.call(context, implClass, implClass, "", Block.NULL_BLOCK);`
	`1967`	`+ return method.call(context, implClass, implClass, null, Block.NULL_BLOCK);`
`1968`	`1968`	`}`
`1969`	`1969`
`1970`	`1970`	`@JIT`