Implement Array operand IR2JVM.

Author: headius

build_lib/invokebinder.jar

@@ -2,6 +2,8 @@
 
 import java.util.List;
 import java.util.Map;
+
+import org.jruby.ir.targets.JVM;
 import org.jruby.ir.transformations.inlining.InlinerInfo;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.ThreadContext;
@@ -118,4 +120,15 @@ public Object retrieve(ThreadContext context, IRubyObject self, DynamicScope cur
 
         return context.getRuntime().newArray(elements);
     }
+
+    @Override
+    public void compile(JVM jvm) {
+        jvm.method().loadLocal(0);
+
+        for (Operand operand : elts) {
+            jvm.emit(operand);
+        }
+
+        jvm.method().array(elts.length);
+    }
 }

src/org/jruby/ir/operands/Array.java

@@ -82,6 +82,6 @@ public Object retrieve(ThreadContext context, IRubyObject self, DynamicScope cur
     }
 
     public void compile(JVM jvm) {
-        throw new RuntimeException(this.getClass().getSimpleName() + " has no compile logic.");
+        throw new RuntimeException("operand " + this.getClass().getSimpleName() + " has no compile logic.");
     }
 }

src/org/jruby/ir/operands/Operand.java

@@ -1,24 +1,18 @@
 package org.jruby.ir.targets;
 
-import com.headius.invoke.binder.Binder;
-import org.jcodings.Encoding;
-import org.jcodings.EncodingDB;
-import org.jcodings.specific.USASCIIEncoding;
+import com.headius.invokebinder.Binder;
+import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyEncoding;
 import org.jruby.RubyFixnum;
-import org.jruby.RubyInstanceConfig;
 import org.jruby.RubyString;
 import org.jruby.RubySymbol;
 import org.jruby.internal.runtime.methods.DynamicMethod;
-import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.CallType;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.callsite.CacheEntry;
-import org.jruby.runtime.encoding.EncodingService;
-import org.jruby.runtime.invokedynamic.JRubyCallSite;
 import org.jruby.util.JavaNameMangler;
 import org.objectweb.asm.Handle;
 import org.objectweb.asm.Opcodes;
@@ -29,13 +23,11 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.MutableCallSite;
-import java.lang.invoke.SwitchPoint;
-import java.util.Arrays;
 
-import static org.jruby.runtime.invokedynamic.InvokeDynamicSupport.*;
-import static org.jruby.util.CodegenUtils.*;
 import static java.lang.invoke.MethodHandles.*;
-import static java.lang.invoke.MethodType.*;
+import static org.jruby.runtime.invokedynamic.InvokeDynamicSupport.*;
+import static org.jruby.util.CodegenUtils.p;
+import static org.jruby.util.CodegenUtils.sig;
 
 public class Bootstrap {
     public static CallSite string(Lookup lookup, String name, MethodType type, String value, int encoding) {
@@ -47,6 +39,15 @@ public static CallSite string(Lookup lookup, String name, MethodType type, Strin
         return site;
     }
 
+    public static CallSite array(Lookup lookup, String name, MethodType type) {
+        MethodHandle handle = Binder
+                .from(type)
+                .collect(1, IRubyObject[].class)
+                .invokeStaticQuiet(MethodHandles.lookup(), Bootstrap.class, "array");
+        CallSite site = new ConstantCallSite(handle);
+        return site;
+    }
+
     private static class InvokeSite extends MutableCallSite {
         public InvokeSite(MethodType type, String name) {
             super(type);
@@ -117,6 +118,10 @@ public static Handle string() {
         return new Handle(Opcodes.H_INVOKESTATIC, p(Bootstrap.class), "string", sig(CallSite.class, Lookup.class, String.class, MethodType.class, String.class, int.class));
     }
 
+    public static Handle array() {
+        return new Handle(Opcodes.H_INVOKESTATIC, p(Bootstrap.class), "array", sig(CallSite.class, Lookup.class, String.class, MethodType.class));
+    }
+
     public static Handle invoke() {
         return new Handle(Opcodes.H_INVOKESTATIC, p(Bootstrap.class), "invoke", sig(CallSite.class, Lookup.class, String.class, MethodType.class));
     }
@@ -138,6 +143,10 @@ public static IRubyObject string(String value, int encoding, ThreadContext conte
         return RubyString.newStringNoCopy(context.runtime, value.getBytes(RubyEncoding.ISO));
     }
 
+    public static IRubyObject array(ThreadContext context, IRubyObject[] elts) {
+        return RubyArray.newArrayNoCopy(context.runtime, elts);
+    }
+
     public static IRubyObject invoke(InvokeSite site, ThreadContext context, IRubyObject self) throws Throwable {
         RubyClass selfClass = pollAndGetClass(context, self);
         String methodName = site.name;

src/org/jruby/ir/targets/Bootstrap.java

@@ -162,6 +162,10 @@ public void returnValue() {
         adapter.areturn();
     }
 
+    public void array(int length) {
+        adapter.invokedynamic("array", sig(JVM.OBJECT, params(ThreadContext.class, JVM.OBJECT, length)), Bootstrap.array());
+    }
+
     public int newLocal(String name, Type type) {
         int index = variableCount++;
         variableTypes.put(index, type);

src/org/jruby/ir/targets/IRBytecodeAdapter.java

@@ -189,10 +189,8 @@ public void emit(Operand operand) {
             operand.compile(this);
         } else if (operand instanceof Variable) {
             emitVariable((Variable)operand);
-        } else if (operand instanceof Symbol) {
-            operand.compile(this);
         } else {
-            throw new RuntimeException("unsupported operand in compiler: " + operand.getClass());
+            operand.compile(this);
         }
     }