Reapply "Remove classes Computation and BindInstr."

runtime/vm/intermediate_language_test.cc

Index: runtime/vm/intermediate_language_test.cc
diff --git a/runtime/vm/intermediate_language_test.cc b/runtime/vm/intermediate_language_test.cc
index 28d2b5c55e88aa31d6ad75a43928a62e1e1152d5..71b48fb97bd7de29f5db59bfb72f527e4c6c131b 100644
--- a/runtime/vm/intermediate_language_test.cc
+++ b/runtime/vm/intermediate_language_test.cc
@@ -11,11 +11,10 @@ TEST_CASE(InstructionTests) {
   TargetEntryInstr* target_instr =
       new TargetEntryInstr(CatchClauseNode::kInvalidTryIndex);
   EXPECT(target_instr->IsBlockEntry());
-  EXPECT(!target_instr->IsBind());
-  BindInstr* bind_instr =
-      new BindInstr(Definition::kEffect, new CurrentContextComp());
-  EXPECT(bind_instr->IsBind());
-  EXPECT(!bind_instr->IsBlockEntry());
+  EXPECT(!target_instr->IsDefinition());
+  CurrentContextInstr* context = new CurrentContextInstr();
+  EXPECT(context->IsDefinition());
+  EXPECT(!context->IsBlockEntry());
 }
 
 
@@ -31,11 +30,11 @@ TEST_CASE(OptimizationTests) {
   Value* use2 = new Value(def2);
   EXPECT(!use2->Equals(use1a));
 
-  ConstantComp* c1 = new ConstantComp(Bool::ZoneHandle(Bool::True()));
-  ConstantComp* c2 = new ConstantComp(Bool::ZoneHandle(Bool::True()));
+  ConstantInstr* c1 = new ConstantInstr(Bool::ZoneHandle(Bool::True()));
+  ConstantInstr* c2 = new ConstantInstr(Bool::ZoneHandle(Bool::True()));
   EXPECT(c1->Equals(c2));
-  ConstantComp* c3 = new ConstantComp(Object::ZoneHandle());
-  ConstantComp* c4 = new ConstantComp(Object::ZoneHandle());
+  ConstantInstr* c3 = new ConstantInstr(Object::ZoneHandle());
+  ConstantInstr* c4 = new ConstantInstr(Object::ZoneHandle());
   EXPECT(c3->Equals(c4));
   EXPECT(!c3->Equals(c1));
 }