Add alias disambiguation for VM fields.

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/bit_vector.h"
 #include "vm/class_finalizer.h"
@@ skipping 2259 matching lines @@
     type_arguments = BuildInstantiatorTypeArguments(node->token_pos(),
                                                     instantiator_class,
                                                     NULL);
     arguments->Add(PushArgument(type_arguments));
   }
   AllocateObjectInstr* alloc = new AllocateObjectInstr(node->token_pos(),
                                                        cls,
                                                        arguments);
   alloc->set_closure_function(function);
 
-  // Create fake fields for function and context. Only the context field is
-  // stored at the allocation to be used later when inlining a closure call.
-  const Field& function_field =
-      Field::ZoneHandle(
-          Field::New(Symbols::ClosureFunctionField(),
-          false,  // !static
-          true,  // final
-          false,  // !const
-          alloc->cls(),
-          0));  // No token position.
-  function_field.SetOffset(Closure::function_offset());
-  const Field& context_field =
-      Field::ZoneHandle(Field::New(
-          Symbols::ClosureContextField(),
-          false,  // !static
-          true,  // final
-          false,  // !const
-          alloc->cls(),
-          0));  // No token position.
-  context_field.SetOffset(Closure::context_offset());
-  alloc->set_context_field(context_field);
-
   Value* closure_val = Bind(alloc);
   { LocalVariable* closure_tmp_var = EnterTempLocalScope(closure_val);
     // Store function.
     Value* closure_tmp_val = Bind(new LoadLocalInstr(*closure_tmp_var));
     Value* func_val =
         Bind(new ConstantInstr(Function::ZoneHandle(function.raw())));
-    Do(new StoreInstanceFieldInstr(function_field,
+    Do(new StoreInstanceFieldInstr(Closure::function_offset(),
                                    closure_tmp_val,
                                    func_val,
                                    kEmitStoreBarrier));
     if (is_implicit) {
       // Create new context containing the receiver.
       const intptr_t kNumContextVariables = 1;  // The receiver.
       Value* allocated_context =
           Bind(new AllocateContextInstr(node->token_pos(),
                                         kNumContextVariables));
       { LocalVariable* context_tmp_var = EnterTempLocalScope(allocated_context);
         // Store receiver in context.
         Value* context_tmp_val = Bind(new LoadLocalInstr(*context_tmp_var));
         ValueGraphVisitor for_receiver(owner());
         node->receiver()->Visit(&for_receiver);
         Append(for_receiver);
         Value* receiver = for_receiver.value();
         Do(new StoreInstanceFieldInstr(Context::variable_offset(0),
                                        context_tmp_val,
                                        receiver,
                                        kEmitStoreBarrier));
         // Store new context in closure.
         closure_tmp_val = Bind(new LoadLocalInstr(*closure_tmp_var));
         context_tmp_val = Bind(new LoadLocalInstr(*context_tmp_var));
-        Do(new StoreInstanceFieldInstr(context_field,
+        Do(new StoreInstanceFieldInstr(Closure::context_offset(),
                                        closure_tmp_val,
                                        context_tmp_val,
                                        kEmitStoreBarrier));
         Do(ExitTempLocalScope(context_tmp_var));
       }
     } else {
       // Store current context in closure.
       closure_tmp_val = Bind(new LoadLocalInstr(*closure_tmp_var));
       Value* context = Bind(new CurrentContextInstr());
-      Do(new StoreInstanceFieldInstr(context_field,
+      Do(new StoreInstanceFieldInstr(Closure::context_offset(),
                                      closure_tmp_val,
                                      context,
                                      kEmitStoreBarrier));
     }
     ReturnDefinition(ExitTempLocalScope(closure_tmp_var));
   }
 }
 
 
 void EffectGraphVisitor::BuildPushArguments(
@@ skipping 1572 matching lines @@
                                   LanguageError::kError,
                                   Heap::kNew,
                                   "FlowGraphBuilder Bailout: %s %s",
                                   String::Handle(function.name()).ToCString(),
                                   reason));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart