Add non-indy caching of GlobalVariable accessors.

jruby · Jun 14, 2017 · 4d1b0c1 · 4d1b0c1
1 parent ded9644
commit 4d1b0c1
Showing 1 changed file with 55 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/ir/targets/IRBytecodeAdapter6.java b/core/src/main/java/org/jruby/ir/targets/IRBytecodeAdapter6.java
@@ -27,6 +27,8 @@
 import org.jruby.RubySymbol;
 import org.jruby.compiler.NotCompilableException;
 import org.jruby.compiler.impl.SkinnyMethodAdapter;
+import org.jruby.internal.runtime.GlobalVariable;
+import org.jruby.internal.runtime.GlobalVariables;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.parser.StaticScope;
@@ -37,6 +39,7 @@
 import org.jruby.runtime.CompiledIRBlockBody;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.Helpers;
+import org.jruby.runtime.IAccessor;
 import org.jruby.runtime.MethodIndex;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -846,6 +849,50 @@ private void cacheVariableAccessor(String name, boolean write) {
         adapter.invokestatic(className, methodName, incomingSig);
     }
 
+    private void cacheGlobalAccessor(String name) {
+        SkinnyMethodAdapter adapter2;
+        String incomingSig = sig(GlobalVariable.class, params(ThreadContext.class));
+
+        String methodName = "global" + getClassData().callSiteCount.getAndIncrement() + ':' + JavaNameMangler.mangleMethodName(name);
+
+        adapter2 = new SkinnyMethodAdapter(
+                adapter.getClassVisitor(),
+                Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC,
+                methodName,
+                incomingSig,
+                null,
+                null);
+
+        // call site object field
+        adapter.getClassVisitor().visitField(Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC, methodName, ci(GlobalVariable.class), null, null).visitEnd();
+
+        final String className = getClassData().clsName;
+
+        // retrieve accessor, verifying if non-null
+        adapter2.getstatic(className, methodName, ci(GlobalVariable.class));
+        adapter2.dup();
+        Label get = new Label();
+        adapter2.ifnull(get);
+        adapter2.areturn();
+
+        adapter2.label(get);
+        adapter2.pop();
+        adapter2.aload(0);
+        adapter2.getfield(p(ThreadContext.class), "runtime", ci(Ruby.class));
+        adapter2.invokevirtual(p(Ruby.class), "getGlobalVariables", sig(GlobalVariables.class));
+        adapter2.ldc(name);
+        adapter2.invokevirtual(p(GlobalVariables.class), "getVariable", sig(GlobalVariable.class, String.class));
+        adapter2.dup();
+        adapter2.putstatic(className, methodName, ci(GlobalVariable.class));
+        adapter2.areturn();
+
+        adapter2.end();
+
+        // call it from original method to get accessor
+        loadContext();
+        adapter.invokestatic(className, methodName, incomingSig);
+    }
+
     public void array(int length) {
         if (length > MAX_ARGUMENTS) throw new NotCompilableException("literal array has more than " + MAX_ARGUMENTS + " elements");
 
@@ -961,17 +1008,18 @@ public void checkpoint() {
 
     @Override
     public void getGlobalVariable(String name, String file, int line) {
-        loadRuntime();
-        adapter.ldc(name);
-        invokeHelper("getGlobalVariable", sig(IRubyObject.class, Ruby.class, String.class));
+        cacheGlobalAccessor(name);
+        adapter.invokevirtual(p(GlobalVariable.class), "getAccessor", sig(IAccessor.class));
+        adapter.invokeinterface(p(IAccessor.class), "getValue", sig(IRubyObject.class));
     }
 
     @Override
     public void setGlobalVariable(String name, String file, int line) {
-        loadRuntime();
-        adapter.ldc(name);
-        invokeHelper("setGlobalVariable", sig(IRubyObject.class, IRubyObject.class, Ruby.class, String.class));
-        adapter.pop();
+        cacheGlobalAccessor(name);
+        adapter.invokevirtual(p(GlobalVariable.class), "getAccessor", sig(IAccessor.class));
+        adapter.swap();
+        adapter.invokeinterface(p(IAccessor.class), "setValue", sig(IRubyObject.class, IRubyObject.class));
+        adapter.pop();;
     }
 
     @Override