- Get rid of RawClosure class and use RawInstance for closures.

vm/stub_code_x64.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/globals.h"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/assembler.h"
 #include "vm/assembler_macros.h"
 #include "vm/compiler.h"
@@ skipping 1340 matching lines @@
     // next object start and initialize the object.
     __ movq(RDI, Immediate(heap->TopAddress()));
     __ movq(Address(RDI, 0), R13);
 
     // RAX: new closure object.
     // RBX: new context object (only if is_implicit_closure).
     // Set the tags.
     uword tags = 0;
     tags = RawObject::SizeTag::update(closure_size, tags);
     tags = RawObject::ClassIdTag::update(cls.id(), tags);
-    __ movq(Address(RAX, Closure::tags_offset()), Immediate(tags));
+    __ movq(Address(RAX, Instance::tags_offset()), Immediate(tags));
 
     // Initialize the function field in the object.
     // RAX: new closure object.
     // RBX: new context object (only if is_implicit_closure).
     // R13: next object start.
     __ LoadObject(R10, func);  // Load function of closure to be allocated.
     __ movq(Address(RAX, Closure::function_offset()), R10);
 
     // Setup the context for this closure.
     if (is_implicit_static_closure) {
@@ skipping 31 matching lines @@
       __ addq(RBX, Immediate(kHeapObjectTag));
       __ movq(Address(RAX, Closure::context_offset()), RBX);
     } else {
       __ movq(Address(RAX, Closure::context_offset()), CTX);
     }
 
     // Set the type arguments field in the newly allocated closure.
     __ movq(R10, Address(RSP, kTypeArgumentsOffset));
     __ movq(Address(RAX, Closure::type_arguments_offset()), R10);
 
-    __ movq(Address(RAX, Closure::smrck_offset()), raw_null);
-
     // Done allocating and initializing the instance.
     // RAX: new object.
     __ addq(RAX, Immediate(kHeapObjectTag));
     __ ret();
 
     __ Bind(&slow_case);
   }
   if (has_type_arguments) {
     __ movq(RCX, Address(RSP, kTypeArgumentsOffset));
   }
@@ skipping 590 matching lines @@
   __ CallRuntime(kUpdateICDataTwoArgsRuntimeEntry);
   __ Drop(4);
   __ LeaveFrame();
 
   __ jmp(&compute_result, Assembler::kNearJump);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64