Make sure new names are used everywhere

headius · headius · commit 45c4988467aa · 2024-05-28T13:57:11.000-05:00
These names were hardcoded which broke aspects of compilation and
JIT testing.
diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -100,6 +100,7 @@ public class JVMVisitor extends IRVisitor {
     public static final String DYNAMIC_SCOPE = "variableStore";
     private static final boolean DEBUG = false;
     public static final String BLOCK_ARG_NAME = "blockArg";
+    public static final String BLOCK_ARG_LOCAL_NAME = "&";
     public static final String SELF_BLOCK_NAME = "selfBlock";
     public static final String SUPER_NAME_NAME = "superName";
 
@@ -2131,7 +2132,7 @@ public void PutGlobalVarInstr(PutGlobalVarInstr putglobalvarinstr) {
     @Override
     public void ReifyClosureInstr(ReifyClosureInstr reifyclosureinstr) {
         jvmMethod().loadContext();
-        jvmLoadLocal("$blockArg");
+        jvmLoadLocal(BLOCK_ARG_LOCAL_NAME);
         jvmMethod().invokeIRHelper("newProc", sig(IRubyObject.class, ThreadContext.class, Block.class));
         jvmStoreLocal(reifyclosureinstr.getResult());
     }
diff --git a/core/src/main/java/org/jruby/ir/targets/MethodData.java b/core/src/main/java/org/jruby/ir/targets/MethodData.java
@@ -33,7 +33,7 @@ public MethodData(IRBytecodeAdapter method, IRScope scope, String scopeField, Si
             String argName = signature.argName(i);
             argName = switch (argName) {
                 case "self" -> "self";
-                case "blockArg" -> "&";
+                case "blockArg" -> JVMVisitor.BLOCK_ARG_LOCAL_NAME;
                 default -> "$" + argName;
             };
             local(argName, Type.getType(signature.argType(i)));
diff --git a/core/src/main/java/org/jruby/util/JavaNameMangler.java b/core/src/main/java/org/jruby/util/JavaNameMangler.java
@@ -290,6 +290,8 @@ private static char unescapeChar(char character) {
     private static final String SCRIPT_MARKER = "script";
     private static final char DELIMITER = '\u00A0';
 
+    public static final String SCRIPT_METHOD_NAME = RUBY_MARKER + DELIMITER + SCRIPT_MARKER;
+
     public static String encodeNumberedScopeForBacktrace(IRScope scope, int number) {
         return encodeScopeForBacktrace(scope) + DELIMITER + '#' + number;
     }
@@ -316,7 +318,7 @@ public static String encodeScopeForBacktrace(IRScope scope) {
         } else if (scope instanceof IRModuleBody) {
             base = RUBY_MARKER + DELIMITER + MODULE_MARKER + DELIMITER + mangleMethodNameInternal(scope.getId());
         } else if (scope instanceof IRScriptBody) {
-            base = RUBY_MARKER + DELIMITER + SCRIPT_MARKER;
+            base = SCRIPT_METHOD_NAME;
         } else {
             throw new IllegalStateException("unknown scope type for backtrace encoding: " + scope.getClass());
         }
diff --git a/spec/compiler/general_spec.rb b/spec/compiler/general_spec.rb
@@ -96,7 +96,8 @@ def compile_to_method(src, filename, lineno)
 
     compiler = new_visitor(runtime)
     compiled = compiler.compile(method, org.jruby.util.OneShotClassLoader.new(runtime.getJRubyClassLoader()))
-    scriptMethod = compiled.getMethod("RUBY$script",
+    scriptMethod = compiled.getMethod(
+        org.jruby.util.JavaNameMangler::SCRIPT_METHOD_NAME,
         org.jruby.runtime.ThreadContext.java_class,
         org.jruby.parser.StaticScope.java_class,
         org.jruby.runtime.builtin.IRubyObject.java_class,
