Track references to allocation stubs via static_calls_table, instead of keeping two referencers ali…

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 3499 matching lines @@
 
 void Class::set_allocation_stub(const Code& value) const {
   // Never clear the stub as it may still be a target, but will be GC-d if
   // not referenced.
   ASSERT(!value.IsNull());
   ASSERT(raw_ptr()->allocation_stub_ == Code::null());
   StorePointer(&raw_ptr()->allocation_stub_, value.raw());
 }
 
 
-void Class::SwitchAllocationStub() const {
-  const Code& alloc_stub = Code::Handle(allocation_stub());
-  if (!alloc_stub.IsNull()) {
-    CodePatcher::PatchEntry(alloc_stub);
-    const Code& spare_alloc_stub = Code::Handle(spare_allocation_stub());
-    if (spare_alloc_stub.IsNull()) {
-      StorePointer(&raw_ptr()->allocation_stub_, Code::null());
-    } else {
-      ASSERT(CodePatcher::IsEntryPatched(spare_alloc_stub));
-      CodePatcher::RestoreEntry(spare_alloc_stub);
-      StorePointer(&raw_ptr()->allocation_stub_, spare_alloc_stub.raw());
-    }
-    StorePointer(&raw_ptr()->spare_allocation_stub_, alloc_stub.raw());
-  }
+void Class::DisableAllocationStub() const {
+  StorePointer(&raw_ptr()->allocation_stub_, Code::null());
 }
 
 
 bool Class::IsFunctionClass() const {
   return raw() == Type::Handle(Type::Function()).type_class();
 }
 
 
 bool Class::IsCanonicalSignatureClass() const {
   const Function& function = Function::Handle(signature_function());
@@ skipping 8446 matching lines @@
   const intptr_t i = BinarySearchInSCallTable(pc);
   ASSERT(i >= 0);
   const Array& array =
       Array::Handle(raw_ptr()->static_calls_target_table_);
   ASSERT(code.IsNull() ||
          (code.function() == array.At(i + kSCallTableFunctionEntry)));
   array.SetAt(i + kSCallTableCodeEntry, code);
 }
 
 
+void Code::SetStubCallTargetCodeAt(uword pc, const Code& code) const {
+  const intptr_t i = BinarySearchInSCallTable(pc);
+  ASSERT(i >= 0);
+  const Array& array =
+      Array::Handle(raw_ptr()->static_calls_target_table_);
+#if defined(DEBUG)
+  if (array.At(i + kSCallTableFunctionEntry) == Function::null()) {
+    ASSERT(!code.IsNull() && Object::Handle(code.owner()).IsClass());
+  } else {
+    ASSERT(code.IsNull() ||
+           (code.function() == array.At(i + kSCallTableFunctionEntry)));
+  }
+#endif
+  array.SetAt(i + kSCallTableCodeEntry, code);
+}
+
+
 void Code::Disassemble(DisassemblyFormatter* formatter) const {
   const bool fix_patch = CodePatcher::CodeIsPatchable(*this) &&
                          CodePatcher::IsEntryPatched(*this);
   if (fix_patch) {
     // The disassembler may choke on illegal instructions if the code has been
     // patched, un-patch the code before disassembling and re-patch after.
     CodePatcher::RestoreEntry(*this);
   }
   const Instructions& instr = Instructions::Handle(instructions());
   uword start = instr.EntryPoint();
@@ skipping 8265 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart