jruby · Jan 12, 2015 · Jan 12, 2015 · Jan 12, 2015
diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -236,9 +236,7 @@ public void cloneIntoHostScope(IRBuilder b, IRScope s) {
             // are not cloned.
             ii.renameLabel(start);
             for (Instr i: instrs) {
-                if (i instanceof LabelInstr) {
-                    ii.renameLabel(((LabelInstr)i).label);
-                }
+                if (i instanceof LabelInstr) ii.renameLabel(((LabelInstr)i).getLabel());
             }
 
             // Clone instructions now
@@ -2056,36 +2054,39 @@ private Operand dynamicPiece(Node pieceNode, IRScope s) {
         return piece == null ? manager.getNil() : piece;
     }
 
-    public Operand buildDRegexp(DRegexpNode dregexpNode, IRScope s) {
-        List<Operand> strPieces = new ArrayList<>();
-        for (Node n : dregexpNode.childNodes()) {
-            strPieces.add(dynamicPiece(n, s));
+    public Operand buildDRegexp(DRegexpNode node, IRScope s) {
+        List<Node> nodePieces = node.childNodes();
+        Operand[] pieces = new Operand[nodePieces.size()];
+        for (int i = 0; i < pieces.length; i++) {
+            pieces[i] = dynamicPiece(nodePieces.get(i), s);
         }
 
         Variable res = s.createTemporaryVariable();
-        addInstr(s, new BuildDynRegExpInstr(res, strPieces, dregexpNode.getOptions()));
+        addInstr(s, new BuildDynRegExpInstr(res, pieces, node.getOptions()));
         return res;
     }
 
-    public Operand buildDStr(DStrNode dstrNode, IRScope s) {
-        List<Operand> strPieces = new ArrayList<>();
-        for (Node n : dstrNode.childNodes()) {
-            strPieces.add(dynamicPiece(n, s));
+    public Operand buildDStr(DStrNode node, IRScope s) {
+        List<Node> nodePieces = node.childNodes();
+        Operand[] pieces = new Operand[nodePieces.size()];
+        for (int i = 0; i < pieces.length; i++) {
+            pieces[i] = dynamicPiece(nodePieces.get(i), s);
         }
 
         Variable res = s.createTemporaryVariable();
-        addInstr(s, new BuildCompoundStringInstr(res, strPieces, dstrNode.getEncoding()));
+        addInstr(s, new BuildCompoundStringInstr(res, pieces, node.getEncoding()));
         return copyAndReturnValue(s, res);
     }
 
     public Operand buildDSymbol(DSymbolNode node, IRScope s) {
-        List<Operand> strPieces = new ArrayList<>();
-        for (Node n : node.childNodes()) {
-            strPieces.add(dynamicPiece(n, s));
+        List<Node> nodePieces = node.childNodes();
+        Operand[] pieces = new Operand[nodePieces.size()];
+        for (int i = 0; i < pieces.length; i++) {
+            pieces[i] = dynamicPiece(nodePieces.get(i), s);
         }
 
         Variable res = s.createTemporaryVariable();
-        addInstr(s, new BuildCompoundStringInstr(res, strPieces, node.getEncoding()));
+        addInstr(s, new BuildCompoundStringInstr(res, pieces, node.getEncoding()));
         return copyAndReturnValue(s, new DynamicSymbol(res));
     }
 
@@ -2094,14 +2095,13 @@ public Operand buildDVar(DVarNode node, IRScope s) {
     }
 
     public Operand buildDXStr(final DXStrNode dstrNode, IRScope s) {
-        List<Operand> strPieces = new ArrayList<>();
-        for (Node nextNode : dstrNode.childNodes()) {
-            strPieces.add(dynamicPiece(nextNode, s));
+        List<Node> nodePieces = dstrNode.childNodes();
+        Operand[] pieces = new Operand[nodePieces.size()];
+        for (int i = 0; i < pieces.length; i++) {
+            pieces[i] = dynamicPiece(nodePieces.get(i), s);
         }
 
-        Variable res = s.createTemporaryVariable();
-        addInstr(s, new BacktickInstr(res, strPieces));
-        return res;
+        return addResultInstr(s, new BacktickInstr(s.createTemporaryVariable(), pieces));
     }
 
     /* ****************************************************************
@@ -3414,9 +3414,7 @@ public Operand buildWhile(final WhileNode whileNode, IRScope s) {
     }
 
     public Operand buildXStr(XStrNode node, IRScope s) {
-        Variable res = s.createTemporaryVariable();
-        addInstr(s, new BacktickInstr(res, new StringLiteral(node.getValue())));
-        return res;
+        return addResultInstr(s, new BacktickInstr(s.createTemporaryVariable(), new Operand[] { new StringLiteral(node.getValue())}));
     }
 
     public Operand buildYield(YieldNode node, IRScope s) {

diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -106,7 +106,7 @@ public abstract class IRScope implements ParseResult {
 
     /** What the interpreter depends on to interpret this IRScope */
     protected InterpreterContext interpreterContext;
-    private List<BasicBlock> linearizedBBList;
+    private BasicBlock[] linearizedBBList;
     protected int temporaryVariableIndex;
     protected int floatVariableIndex;
     protected int fixnumVariableIndex;
@@ -620,7 +620,7 @@ public synchronized List<BasicBlock> prepareForCompilation() {
 
         runCompilerPasses(getManager().getJITPasses(this));
 
-        return buildLinearization();
+        return Arrays.asList(buildLinearization());
     }
 
     private void setupLinearization() {
@@ -1037,15 +1037,15 @@ public void resetLinearizationData() {
         linearizedBBList = null;
     }
 
-    public List<BasicBlock> buildLinearization() {
+    public BasicBlock[] buildLinearization() {
         if (linearizedBBList != null) return linearizedBBList; // Already linearized
 
         linearizedBBList = CFGLinearizer.linearize(cfg);
 
         return linearizedBBList;
     }
 
-    public List<BasicBlock> linearization() {
+    public BasicBlock[] linearization() {
         depends(cfg());
 
         assert linearizedBBList != null: "You have not run linearization";

diff --git a/core/src/main/java/org/jruby/ir/dataflow/analyses/UnboxableOpsAnalysisNode.java b/core/src/main/java/org/jruby/ir/dataflow/analyses/UnboxableOpsAnalysisNode.java
@@ -244,9 +244,8 @@ public void applyTransferFunction(Instr i) {
                 CallBase c = (CallBase)i;
                 String m = c.getName();
                 Operand  r = c.getReceiver();
-                Operand[] args = c.getCallArgs();
-                if (dst != null && args.length == 1 && resemblesALUOp(m)) {
-                    Operand a = args[0];
+                if (dst != null && c.getArgsCount() == 1 && resemblesALUOp(m)) {
+                    Operand a = c.getArg1();
                     Class receiverType = getOperandType(tmpState, r);
                     Class argType = getOperandType(tmpState, a);
                     // Optimistically assume that call is an ALU op
@@ -643,9 +642,8 @@ public void unbox(Map<Variable, TemporaryLocalVariable> unboxMap) {
                         CallBase c = (CallBase)i;
                         String m = c.getName();
                         Operand  r = c.getReceiver();
-                        Operand[] args = c.getCallArgs();
-                        if (dst != null && args.length == 1 && resemblesALUOp(m)) {
-                            Operand a = args[0];
+                        if (dst != null && c.getArgsCount() == 1 && resemblesALUOp(m)) {
+                            Operand a = c.getArg1();
                             Class receiverType = getOperandType(tmpState, r);
                             Class argType = getOperandType(tmpState, a);
                             // Optimistically assume that call is an ALU op

diff --git a/core/src/main/java/org/jruby/ir/instructions/AliasInstr.java b/core/src/main/java/org/jruby/ir/instructions/AliasInstr.java
@@ -15,25 +15,9 @@
 import java.util.Map;
 
 public class AliasInstr extends Instr implements FixedArityInstr {
-    private Operand newName;
-    private Operand oldName;
-
     // SSS FIXME: Implicit self arg -- make explicit to not get screwed by inlining!
     public AliasInstr(Operand newName, Operand oldName) {
-        super(Operation.ALIAS);
-
-        this.newName = newName;
-        this.oldName = oldName;
-    }
-
-    @Override
-    public Operand[] getOperands() {
-        return new Operand[] {getNewName(), getOldName()};
-    }
-
-    @Override
-    public String toString() {
-        return getOperation().toString() + "(" + getNewName() + ", " + getOldName() + ")";
+        super(Operation.ALIAS, new Operand[] {newName, oldName});
     }
 
     @Override
@@ -42,12 +26,6 @@ public boolean computeScopeFlags(IRScope scope) {
         return true;
     }
 
-    @Override
-    public void simplifyOperands(Map<Operand, Operand> valueMap, boolean force) {
-        oldName = getOldName().getSimplifiedOperand(valueMap, force);
-        newName = getNewName().getSimplifiedOperand(valueMap, force);
-    }
-
     @Override
     public Instr clone(CloneInfo ii) {
         return new AliasInstr(getNewName().cloneForInlining(ii), getOldName().cloneForInlining(ii));
@@ -67,10 +45,10 @@ public void visit(IRVisitor visitor) {
     }
 
     public Operand getNewName() {
-        return newName;
+        return operands[0];
     }
 
     public Operand getOldName() {
-        return oldName;
+        return operands[1];
     }
 }
diff --git a/core/src/main/java/org/jruby/ir/instructions/ArgScopeDepthInstr.java b/core/src/main/java/org/jruby/ir/instructions/ArgScopeDepthInstr.java
@@ -10,39 +10,16 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
-public class ArgScopeDepthInstr extends Instr implements ResultInstr,FixedArityInstr {
-    private Variable result;
-
+public class ArgScopeDepthInstr extends ResultBaseInstr implements FixedArityInstr {
     public ArgScopeDepthInstr(Variable result) {
-        super(Operation.ARG_SCOPE_DEPTH);
-        this.result = result;
-    }
-
-    @Override
-    public Operand[] getOperands() {
-        return EMPTY_OPERANDS;
-    }
-
-    @Override
-    public Variable getResult() {
-        return result;
-    }
-
-    @Override
-    public void updateResult(Variable v) {
-        this.result = v;
+        super(Operation.ARG_SCOPE_DEPTH, result, EMPTY_OPERANDS);
     }
 
     @Override
     public Instr clone(CloneInfo ii) {
         return new ArgScopeDepthInstr(ii.getRenamedVariable(result));
     }
 
-    @Override
-    public String toString() {
-        return result + " = " + super.toString();
-    }
-
     @Override
     public void visit(IRVisitor visitor) {
         visitor.ArgScopeDepthInstr(this);

diff --git a/core/src/main/java/org/jruby/ir/instructions/AttrAssignInstr.java b/core/src/main/java/org/jruby/ir/instructions/AttrAssignInstr.java
@@ -40,13 +40,13 @@ public boolean computeScopeFlags(IRScope scope) {
 
     @Override
     public Instr clone(CloneInfo ii) {
-        return new AttrAssignInstr(receiver.cloneForInlining(ii), getName(), cloneCallArgs(ii));
+        return new AttrAssignInstr(getReceiver().cloneForInlining(ii), getName(), cloneCallArgs(ii));
     }
 
     @Override
     public Object interpret(ThreadContext context, StaticScope currScope, DynamicScope dynamicScope, IRubyObject self, Object[] temp) {
-        IRubyObject object = (IRubyObject) receiver.retrieve(context, self, currScope, dynamicScope, temp);
-        IRubyObject[] values = prepareArguments(context, self, getCallArgs(), currScope, dynamicScope, temp);
+        IRubyObject object = (IRubyObject) getReceiver().retrieve(context, self, currScope, dynamicScope, temp);
+        IRubyObject[] values = prepareArguments(context, self, currScope, dynamicScope, temp);
 
         CallType callType = self == object ? CallType.FUNCTIONAL : CallType.NORMAL;
         Helpers.invoke(context, object, getName(), values, callType, Block.NULL_BLOCK);

diff --git a/core/src/main/java/org/jruby/ir/instructions/BFalseInstr.java b/core/src/main/java/org/jruby/ir/instructions/BFalseInstr.java
@@ -13,11 +13,11 @@
 public class BFalseInstr extends OneOperandBranchInstr implements FixedArityInstr {
     // Public only for persistence reloading
     public BFalseInstr(Operation op, Operand v, Label jmpTarget) {
-        super(op, v, jmpTarget);
+        super(op, new Operand[] {jmpTarget, v});
     }
 
     public BFalseInstr(Operand v, Label jmpTarget) {
-        super(Operation.B_FALSE, v, jmpTarget);
+        super(Operation.B_FALSE, new Operand[] {jmpTarget, v});
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/instructions/BNilInstr.java b/core/src/main/java/org/jruby/ir/instructions/BNilInstr.java
@@ -12,7 +12,7 @@
 
 public class BNilInstr extends OneOperandBranchInstr  implements FixedArityInstr {
     public BNilInstr(Operand v, Label jmpTarget) {
-        super(Operation.B_NIL, v, jmpTarget);
+        super(Operation.B_NIL, new Operand[] {jmpTarget, v});
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/instructions/BTrueInstr.java b/core/src/main/java/org/jruby/ir/instructions/BTrueInstr.java
@@ -12,7 +12,7 @@
 
 public class BTrueInstr extends OneOperandBranchInstr implements FixedArityInstr {
     public BTrueInstr(Operation op, Operand v, Label jmpTarget) {
-        super(op, v, jmpTarget);
+        super(op, new Operand[] {jmpTarget, v});
     }
 
     public BTrueInstr(Operand v, Label jmpTarget) {

diff --git a/core/src/main/java/org/jruby/ir/instructions/BUndefInstr.java b/core/src/main/java/org/jruby/ir/instructions/BUndefInstr.java
@@ -13,7 +13,7 @@
 
 public class BUndefInstr extends OneOperandBranchInstr  implements FixedArityInstr {
     public BUndefInstr(Operand v, Label jmpTarget) {
-        super(Operation.B_UNDEF, v, jmpTarget);
+        super(Operation.B_UNDEF, new Operand[] {jmpTarget, v});
     }
 
     @Override