Remove defunct NotInstr.

jruby · Feb 7, 2014 · d6bf78c · d6bf78c
1 parent 135fa0d
commit d6bf78c
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 101 deletions.
diff --git a/core/src/main/java/org/jruby/ir/IRVisitor.java b/core/src/main/java/org/jruby/ir/IRVisitor.java
@@ -79,7 +79,6 @@ private void error(Object object) {
     public void NonlocalReturnInstr(NonlocalReturnInstr nonlocalreturninstr) { error(nonlocalreturninstr); }
     public void NopInstr(NopInstr nopinstr) { error(nopinstr); }
     public void NoResultCallInstr(NoResultCallInstr noresultcallinstr) { error(noresultcallinstr); }
-    public void NotInstr(NotInstr notinstr) { error(notinstr); }
     public void OptArgMultipleAsgnInstr(OptArgMultipleAsgnInstr optargmultipleasgninstr) { error(optargmultipleasgninstr); }
     public void PopBindingInstr(PopBindingInstr popbindinginstr) { error(popbindinginstr); }
     public void PopFrameInstr(PopFrameInstr popframeinstr) { error(popframeinstr); }

diff --git a/core/src/main/java/org/jruby/ir/instructions/NotInstr.java b/core/src/main/java/org/jruby/ir/instructions/NotInstr.java
diff --git a/core/src/main/java/org/jruby/ir/persistence/InstrDecoderMap.java b/core/src/main/java/org/jruby/ir/persistence/InstrDecoderMap.java
@@ -54,7 +54,6 @@
 import org.jruby.ir.instructions.NoResultCallInstr;
 import org.jruby.ir.instructions.NonlocalReturnInstr;
 import org.jruby.ir.instructions.NopInstr;
-import org.jruby.ir.instructions.NotInstr;
 import org.jruby.ir.instructions.OptArgMultipleAsgnInstr;
 import org.jruby.ir.instructions.PopBindingInstr;
 import org.jruby.ir.instructions.PopFrameInstr;
@@ -197,7 +196,6 @@ public Instr decodeInner(Operation operation) {
             case NONLOCAL_RETURN: return decodeNonlocalReturnInstr();
             case NOP: return NopInstr.NOP;
             case NORESULT_CALL: return decodeNoResultCall();
-            case NOT: return new NotInstr(d.decodeVariable(), d.decodeOperand());
             case POP_BINDING: return new PopBindingInstr();
             case POP_FRAME: return new PopFrameInstr();
             case PROCESS_MODULE_BODY: return new ProcessModuleBodyInstr(d.decodeVariable(), d.decodeOperand());

diff --git a/core/src/main/java/org/jruby/ir/persistence/InstrEncoderMap.java b/core/src/main/java/org/jruby/ir/persistence/InstrEncoderMap.java
@@ -54,7 +54,6 @@
 import org.jruby.ir.instructions.MethodLookupInstr;
 import org.jruby.ir.instructions.NoResultCallInstr;
 import org.jruby.ir.instructions.NonlocalReturnInstr;
-import org.jruby.ir.instructions.NotInstr;
 import org.jruby.ir.instructions.OneOperandBranchInstr;
 import org.jruby.ir.instructions.OptArgMultipleAsgnInstr;
 import org.jruby.ir.instructions.ProcessModuleBodyInstr;
@@ -179,7 +178,6 @@ public void encode(Instr instr) {
             case NONLOCAL_RETURN: encodeNonlocalReturnInstr((NonlocalReturnInstr) instr); break;
             case NOP: /* no state */ break;
             case NORESULT_CALL: encodeCallBaseInstr((NoResultCallInstr) instr); break;
-            case NOT: encodeNotInstr((NotInstr) instr); break;
             case POP_BINDING: /* no state */ break;
             case POP_FRAME: /* no state */ break;
             case PROCESS_MODULE_BODY: encodeProcessModuleBodyInstr((ProcessModuleBodyInstr) instr); break;
@@ -491,10 +489,6 @@ private void encodeCallBaseInstr(CallBase instr) {
         if (hasClosure) e.encode(instr.getClosureArg(null));
     }
 
-    private void encodeNotInstr(NotInstr instr) {
-        e.encode(instr.getArg());
-    }
-
     private void encodeProcessModuleBodyInstr(ProcessModuleBodyInstr instr) {
         e.encode(instr.getModuleBody());
     }

diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -68,7 +68,6 @@
 import org.jruby.ir.instructions.NoResultCallInstr;
 import org.jruby.ir.instructions.NonlocalReturnInstr;
 import org.jruby.ir.instructions.NopInstr;
-import org.jruby.ir.instructions.NotInstr;
 import org.jruby.ir.instructions.OptArgMultipleAsgnInstr;
 import org.jruby.ir.instructions.PopBindingInstr;
 import org.jruby.ir.instructions.PopFrameInstr;
@@ -1313,13 +1312,6 @@ public void NoResultCallInstr(NoResultCallInstr noResultCallInstr) {
         m.adapter.pop();
     }
 
-    @Override
-    public void NotInstr(NotInstr instr) {
-        visit(instr.getArg());
-        // SSS FIXME: Does this really require a helper rather than being inlined?
-        jvm.method().invokeHelper("irNot", IRubyObject.class, ThreadContext.class, IRubyObject.class);
-    }
-
     @Override
     public void OptArgMultipleAsgnInstr(OptArgMultipleAsgnInstr optargmultipleasgninstr) {
         visit(optargmultipleasgninstr.getArrayArg());