Replace ChainContextInstr with existing IL instructions.

runtime/vm/flow_graph_optimizer.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flow_graph_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 3773 matching lines @@
         instance_ = store_indexed->array()->definition();
         index_ = store_indexed->index()->definition();
         break;
       }
 
       case Instruction::kCurrentContext:
         kind_ = kContext;
         *is_load = true;
         break;
 
-      case Instruction::kChainContext:
       case Instruction::kStoreContext:
         kind_ = kContext;
         break;
 
       default:
         break;
     }
   }
 
   intptr_t id() const { return id_; }
@@ skipping 205 matching lines @@
       Definition* instance = store_instance_field->instance()->definition();
       return Alias::Field(GetInstanceFieldId(instance,
                                              store_instance_field->field()));
     }
 
     StoreVMFieldInstr* store_vm_field = instr->AsStoreVMField();
     if (store_vm_field != NULL) {
       return Alias::VMField(store_vm_field->offset_in_bytes());
     }
 
-    if (instr->IsStoreContext() || instr->IsChainContext()) {
+    if (instr->IsStoreContext()) {
       return Alias::CurrentContext();
     }
 
     StoreStaticFieldInstr* store_static_field = instr->AsStoreStaticField();
     if (store_static_field != NULL) {
       return Alias::Field(GetStaticFieldId(store_static_field->field()));
     }
 
     return Alias::None();
   }
@@ skipping 221 matching lines @@
   StoreVMFieldInstr* store_vm_field = instr->AsStoreVMField();
   if (store_vm_field != NULL) {
     return store_vm_field->value()->definition();
   }
 
   StoreStaticFieldInstr* store_static_field = instr->AsStoreStaticField();
   if (store_static_field != NULL) {
     return store_static_field->value()->definition();
   }
 
-  if (instr->IsStoreContext() || instr->IsChainContext()) {
+  if (instr->IsStoreContext()) {
     return instr->InputAt(0)->definition();
   }
 
   UNREACHABLE();  // Should only be called for supported store instructions.
   return NULL;
 }
 
 
 static bool IsPhiDependentPlace(Place* place) {
   return ((place->kind() == Place::kField) ||
@@ skipping 1230 matching lines @@
   }
 }
 
 
 // --------------------------------------------------------------------------
 // Analysis of non-definition instructions.  They do not have values so they
 // cannot have constant values.
 void ConstantPropagator::VisitStoreContext(StoreContextInstr* instr) { }
 
 
-void ConstantPropagator::VisitChainContext(ChainContextInstr* instr) { }
-
-
 void ConstantPropagator::VisitCatchEntry(CatchEntryInstr* instr) { }
 
 
 void ConstantPropagator::VisitCheckStackOverflow(
     CheckStackOverflowInstr* instr) { }
 
 
 void ConstantPropagator::VisitCheckClass(CheckClassInstr* instr) { }
 
 void ConstantPropagator::VisitGuardField(GuardFieldInstr* instr) { }
@@ skipping 1658 matching lines @@
 
   // Insert materializations at environment uses.
   const Class& cls = Class::Handle(alloc->constructor().Owner());
   for (intptr_t i = 0; i < exits.length(); i++) {
     CreateMaterializationAt(exits[i], alloc, cls, *fields);
   }
 }
 
 
 }  // namespace dart