Remove unused context-level from LoadLocal/StoreLocal IL instructions.

runtime/vm/flow_graph_builder.cc

 // Copyright (c) 2012, 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_builder.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/ast_printer.h"
 #include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
@@ skipping 389 matching lines @@
 PushArgumentInstr* EffectGraphVisitor::PushArgument(Value* value) {
   PushArgumentInstr* result = new PushArgumentInstr(value);
   AddInstruction(result);
   return result;
 }
 
 
 Definition* EffectGraphVisitor::BuildStoreTemp(const LocalVariable& local,
                                                Value* value) {
   ASSERT(!local.is_captured());
-  return new StoreLocalInstr(local, value, owner()->context_level());
+  return new StoreLocalInstr(local, value);
 }
 
 
 Definition* EffectGraphVisitor::BuildStoreExprTemp(Value* value) {
   return BuildStoreTemp(*owner()->parsed_function().expression_temp_var(),
                         value);
 }
 
 
 Definition* EffectGraphVisitor::BuildLoadExprTemp() {
@@ skipping 23 matching lines @@
                               Context::variable_offset(local.index()),
                               value,
                               local.type());
     if (result_is_needed) {
       Do(store);
       return BuildLoadExprTemp();
     } else {
       return store;
     }
   } else {
-    return new StoreLocalInstr(local, value, owner()->context_level());
+    return new StoreLocalInstr(local, value);
   }
 }
 
 
 Definition* EffectGraphVisitor::BuildLoadLocal(const LocalVariable& local) {
   if (local.is_captured()) {
     InlineBailout("EffectGraphVisitor::BuildLoadLocal (context)");
     intptr_t delta =
         owner()->context_level() - local.owner()->context_level();
     ASSERT(delta >= 0);
     Value* context = Bind(new CurrentContextInstr());
     while (delta-- > 0) {
       context = Bind(new LoadFieldInstr(
           context, Context::parent_offset(), Type::ZoneHandle()));
     }
     return new LoadFieldInstr(context,
                               Context::variable_offset(local.index()),
                               local.type());
   } else {
-    return new LoadLocalInstr(local, owner()->context_level());
+    return new LoadLocalInstr(local);
   }
 }
 
 
 // Stores current context into the 'variable'
 void EffectGraphVisitor::BuildStoreContext(const LocalVariable& variable) {
   Value* context = Bind(new CurrentContextInstr());
   Do(BuildStoreLocal(variable, context, kResultNotNeeded));
 }
 
@@ skipping 1188 matching lines @@
                                                   node->type(),
                                                   element_type);
   Value* array_val = Bind(create);
   Definition* store = BuildStoreTemp(node->temp_local(), array_val);
   Do(store);
 
   const intptr_t class_id = create->Type()->ToCid();
   const intptr_t deopt_id = Isolate::kNoDeoptId;
   for (int i = 0; i < node->length(); ++i) {
     Value* array = Bind(
-        new LoadLocalInstr(node->temp_local(), owner()->context_level()));
+        new LoadLocalInstr(node->temp_local()));
     Value* index = Bind(new ConstantInstr(Smi::ZoneHandle(Smi::New(i))));
     ValueGraphVisitor for_value(owner(), temp_index());
     node->ElementAt(i)->Visit(&for_value);
     Append(for_value);
     // No store barrier needed for constants.
     const StoreBarrierType emit_store_barrier =
         for_value.value()->BindsToConstant()
             ? kNoStoreBarrier
             : kEmitStoreBarrier;
     intptr_t index_scale = FlowGraphCompiler::ElementSizeFor(class_id);
     StoreIndexedInstr* store = new StoreIndexedInstr(
         array, index, for_value.value(),
         emit_store_barrier, index_scale, class_id, deopt_id);
     Do(store);
   }
 
-  ReturnDefinition(
-      new LoadLocalInstr(node->temp_local(), owner()->context_level()));
+  ReturnDefinition(new LoadLocalInstr(node->temp_local()));
 }
 
 
 void EffectGraphVisitor::VisitClosureNode(ClosureNode* node) {
   const Function& function = node->function();
 
   if (function.IsImplicitStaticClosureFunction()) {
     Instance& closure = Instance::ZoneHandle();
     closure ^= function.implicit_static_closure();
     if (closure.IsNull()) {
@@ skipping 1587 matching lines @@
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, reason) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart