Minimal fixes to IR to get JRuby compiling again.

jruby · Oct 12, 2014 · 440ee53 · 440ee53 · chrisseaton · Oct 12, 2014
1 parent c02df12
commit 440ee53
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/ir/instructions/BreakInstr.java b/core/src/main/java/org/jruby/ir/instructions/BreakInstr.java
@@ -94,7 +94,8 @@ public Instr clone(CloneInfo info) {
             return new BreakInstr(returnValue.cloneForInlining(ii), scopeName);
         }
 
-        return super.clone(ii);
+        throw new UnsupportedOperationException();
+        //return super.clone(ii);
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/instructions/NonlocalReturnInstr.java b/core/src/main/java/org/jruby/ir/instructions/NonlocalReturnInstr.java
@@ -49,7 +49,8 @@ public Instr clone(CloneInfo info) {
             return new NonlocalReturnInstr(returnValue.cloneForInlining(ii), methodName, maybeLambda);
         }
 
-        return super.clone(ii);
+        throw new UnsupportedOperationException();
+        //return super.clone(ii);
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/instructions/ReceiveExceptionBase.java b/core/src/main/java/org/jruby/ir/instructions/ReceiveExceptionBase.java
@@ -3,6 +3,7 @@
 import org.jruby.ir.Operation;
 import org.jruby.ir.operands.Operand;
 import org.jruby.ir.operands.Variable;
+import org.jruby.ir.transformations.inlining.CloneInfo;
 
 public class ReceiveExceptionBase extends Instr implements ResultInstr, FixedArityInstr {
     protected Variable result;
@@ -33,4 +34,10 @@ public String toString() {
     public void updateResult(Variable v) {
         this.result = v;
     }
+
+    @Override
+    public Instr clone(CloneInfo info) {
+        throw new UnsupportedOperationException();
+    }
+
 }
diff --git a/core/src/main/java/org/jruby/ir/instructions/boxing/UnboxInstr.java b/core/src/main/java/org/jruby/ir/instructions/boxing/UnboxInstr.java
@@ -5,6 +5,7 @@
 import org.jruby.ir.instructions.ResultInstr;
 import org.jruby.ir.operands.Operand;
 import org.jruby.ir.operands.Variable;
+import org.jruby.ir.transformations.inlining.CloneInfo;
 
 import java.util.Map;
 
@@ -44,4 +45,10 @@ public void simplifyOperands(Map<Operand, Operand> valueMap, boolean force) {
     public String toString() {
         return getResult() + " = " + getOperation() + "(" + val + ")";
     }
+
+    @Override
+    public Instr clone(CloneInfo info) {
+        throw new UnsupportedOperationException();
+    }
+
 }