Rename Closure instance field type_arguments_ to instantiator_.

runtime/vm/bootstrap.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/bootstrap.h"
 
 #include "include/dart_api.h"
 
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
@@ skipping 249 matching lines @@
 static void Finish(Thread* thread, bool from_kernel) {
   Bootstrap::SetupNativeResolver();
   if (!ClassFinalizer::ProcessPendingClasses(from_kernel)) {
     FATAL("Error in class finalization during bootstrapping.");
   }
 
   // Eagerly compile the _Closure class as it is the class of all closure
   // instances. This allows us to just finalize function types without going
   // through the hoops of trying to compile their scope class.
   ObjectStore* object_store = thread->isolate()->object_store();
-  Class& cls = Class::Handle(thread->zone(), object_store->closure_class());
+  Zone* zone = thread->zone();
+  Class& cls = Class::Handle(zone, object_store->closure_class());
   Compiler::CompileClass(cls);
+
+#if defined(DEBUG)
+  // Verify that closure field offsets are identical in Dart and C++.
+  const Array& fields = Array::Handle(zone, cls.fields());
+  ASSERT(fields.Length() == 3);
+  Field& field = Field::Handle(zone);
+  field ^= fields.At(0);
+  ASSERT(field.Offset() == Closure::instantiator_offset());
+  field ^= fields.At(1);
+  ASSERT(field.Offset() == Closure::function_offset());
+  field ^= fields.At(2);
+  ASSERT(field.Offset() == Closure::context_offset());
+#endif  // defined(DEBUG)
+
   // Eagerly compile Bool class, bool constants are used from within compiler.
   cls = object_store->bool_class();
   Compiler::CompileClass(cls);
 }
 
 
 static RawError* BootstrapFromSource(Thread* thread) {
   Isolate* isolate = thread->isolate();
   Zone* zone = thread->zone();
   String& uri = String::Handle(zone);
@@ skipping 110 matching lines @@
       lib.Register(thread);
       isolate->object_store()->set_bootstrap_library(id, lib);
     }
   }
 
   return (kernel_program == NULL) ? BootstrapFromSource(thread)
                                   : BootstrapFromKernel(thread, kernel_program);
 }
 
 }  // namespace dart