Add alias disambiguation for VM fields.

runtime/vm/flow_graph_inliner.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_inliner.h"
 
 #include "vm/block_scheduler.h"
 #include "vm/compiler.h"
 #include "vm/flags.h"
 #include "vm/flow_graph.h"
@@ skipping 657 matching lines @@
 
     // For closure calls: Store context value.
     FlowGraph* callee_graph = call_data->callee_graph;
     TargetEntryInstr* callee_entry =
         callee_graph->graph_entry()->normal_entry();
     ClosureCallInstr* closure_call = call_data->call->AsClosureCall();
     if (closure_call != NULL) {
       // TODO(fschneider): Avoid setting the context, if not needed.
       Definition* closure =
           closure_call->PushArgumentAt(0)->value()->definition();
-      AllocateObjectInstr* alloc =
-          closure_call->ArgumentAt(0)->AsAllocateObject();
-      Definition* context = NULL;
-      if ((alloc != NULL) && !alloc->closure_function().IsNull()) {
-        ASSERT(!alloc->context_field().IsNull());
-        context = new LoadFieldInstr(new Value(closure),
-                                     &alloc->context_field(),
-                                     Type::ZoneHandle());
-      } else {
-        context = new LoadFieldInstr(new Value(closure),
-                                     Closure::context_offset(),
-                                     Type::ZoneHandle());
-      }
-
+      Definition* context = new LoadFieldInstr(new Value(closure),
+                                               Closure::context_offset(),
+                                               Type::ZoneHandle());
       context->set_ssa_temp_index(caller_graph()->alloc_ssa_temp_index());
       context->InsertAfter(callee_entry);
       StoreContextInstr* set_context =
           new StoreContextInstr(new Value(context));
       set_context->InsertAfter(context);
     }
 
     // Plug result in the caller graph.
     InlineExitCollector* exit_collector = call_data->exit_collector;
     exit_collector->PrepareGraphs(callee_graph);
@@ skipping 792 matching lines @@
         OS::Print("After Inlining of %s\n", flow_graph_->
                   parsed_function().function().ToFullyQualifiedCString());
         FlowGraphPrinter printer(*flow_graph_);
         printer.PrintBlocks();
       }
     }
   }
 }
 
 }  // namespace dart