Cleaned up usage of Function::code, since it may be misunderstood that it points to the only Code o…

runtime/vm/dart_entry.cc

 // Copyright (c) 2011, 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/dart_entry.h"
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/object_store.h"
 #include "vm/resolver.h"
 #include "vm/stub_code.h"
 
 namespace dart {
 
 RawObject* DartEntry::InvokeDynamic(
     const Instance& receiver,
     const Function& function,
     const GrowableArray<const Object*>& arguments,
     const Array& optional_arguments_names) {
   // Get the entrypoint corresponding to the function specified, this
   // will result in a compilation of the function if it is not already
   // compiled.
   if (!function.HasCode()) {
     const Error& error = Error::Handle(Compiler::CompileFunction(function));
     if (!error.IsNull()) {
       return error.raw();
     }
   }
-  const Code& code = Code::Handle(function.code());
-  ASSERT(!code.IsNull());
-  const Instructions& instrs = Instructions::Handle(code.instructions());
-  ASSERT(!instrs.IsNull());
 
   // Set up arguments to include the receiver as the first argument.
   const int num_arguments = arguments.length() + 1;
   GrowableArray<const Object*> args(num_arguments);
   const Object& arg0 = Object::ZoneHandle(receiver.raw());
   args.Add(&arg0);
   for (int i = 1; i < num_arguments; i++) {
     args.Add(arguments[i - 1]);
   }
-
   // Now Call the invoke stub which will invoke the dart function.
   invokestub entrypoint = reinterpret_cast<invokestub>(
       StubCode::InvokeDartCodeEntryPoint());
   const Context& context =
       Context::ZoneHandle(Isolate::Current()->object_store()->empty_context());
   ASSERT(context.isolate() == Isolate::Current());
+  const Code& code = Code::Handle(function.CurrentCode());
+  ASSERT(!code.IsNull());
   return entrypoint(
-      instrs.EntryPoint(),
+      code.EntryPoint(),
       CodeGenerator::ArgumentsDescriptor(num_arguments,
                                          optional_arguments_names),
       args.data(),
       context);
 }
 
 
 RawObject* DartEntry::InvokeStatic(
     const Function& function,
     const GrowableArray<const Object*>& arguments,
     const Array& optional_arguments_names) {
   // Get the entrypoint corresponding to the function specified, this
   // will result in a compilation of the function if it is not already
   // compiled.
   ASSERT(!function.IsNull());
   if (!function.HasCode()) {
     const Error& error = Error::Handle(Compiler::CompileFunction(function));
     if (!error.IsNull()) {
       return error.raw();
     }
   }
-  const Code& code = Code::Handle(function.code());
-  ASSERT(!code.IsNull());
-  const Instructions& instrs = Instructions::Handle(code.instructions());
-  ASSERT(!instrs.IsNull());
-
   // Now Call the invoke stub which will invoke the dart function.
   invokestub entrypoint = reinterpret_cast<invokestub>(
       StubCode::InvokeDartCodeEntryPoint());
   const Context& context =
       Context::ZoneHandle(Isolate::Current()->object_store()->empty_context());
   ASSERT(context.isolate() == Isolate::Current());
+  const Code& code = Code::Handle(function.CurrentCode());
+  ASSERT(!code.IsNull());
   return entrypoint(
-      instrs.EntryPoint(),
+      code.EntryPoint(),
       CodeGenerator::ArgumentsDescriptor(arguments.length(),
                                          optional_arguments_names),
       arguments.data(),
       context);
 }
 
 
 RawObject* DartEntry::InvokeClosure(
     const Closure& closure,
     const GrowableArray<const Object*>& arguments,
     const Array& optional_arguments_names) {
   // Get the entrypoint corresponding to the closure specified, this
   // will result in a compilation of the closure if it is not already
   // compiled.
   ASSERT(Class::Handle(closure.clazz()).signature_function() != Object::null());
   const Function& function = Function::Handle(closure.function());
   const Context& context = Context::Handle(closure.context());
   ASSERT(!function.IsNull());
   if (!function.HasCode()) {
     const Error& error = Error::Handle(Compiler::CompileFunction(function));
     if (!error.IsNull()) {
       return error.raw();
     }
   }
-  const Code& code = Code::Handle(function.code());
-  ASSERT(!code.IsNull());
-  const Instructions& instrs = Instructions::Handle(code.instructions());
-  ASSERT(!instrs.IsNull());
-
   // Now Call the invoke stub which will invoke the closure.
   invokestub entrypoint = reinterpret_cast<invokestub>(
       StubCode::InvokeDartCodeEntryPoint());
   ASSERT(context.isolate() == Isolate::Current());
+  const Code& code = Code::Handle(function.CurrentCode());
+  ASSERT(!code.IsNull());
   return entrypoint(
-      instrs.EntryPoint(),
+      code.EntryPoint(),
       CodeGenerator::ArgumentsDescriptor(arguments.length(),
                                          optional_arguments_names),
       arguments.data(),
       context);
 }
 
 
 RawObject* DartLibraryCalls::ExceptionCreate(
     const String& class_name,
     const GrowableArray<const Object*>& arguments) {
@@ skipping 91 matching lines @@
   arguments.Add(&Integer::Handle(Integer::New(dest_port_id)));
   arguments.Add(&Integer::Handle(Integer::New(reply_port_id)));
   arguments.Add(&message);
   const Object& result = Object::Handle(
       DartEntry::InvokeStatic(function, arguments, kNoArgumentNames));
   ASSERT(result.IsNull() || result.IsError());
   return result.raw();
 }
 
 }  // namespace dart