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

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 1125 matching lines @@
   }
   void set_num_native_fields(uint16_t value) const {
     raw_ptr()->num_native_fields_ = value;
   }
 
   RawCode* allocation_stub() const {
     return raw_ptr()->allocation_stub_;
   }
   void set_allocation_stub(const Code& value) const;
 
-  void SwitchAllocationStub() const;
+  void DisableAllocationStub() const;
 
   RawArray* constants() const;
 
   intptr_t FindInvocationDispatcherFunctionIndex(const Function& needle) const;
   RawFunction* InvocationDispatcherFunctionFromIndex(intptr_t idx) const;
 
   RawFunction* GetInvocationDispatcher(const String& target_name,
                                        const Array& args_desc,
                                        RawFunction::Kind kind) const;
 
@@ skipping 112 matching lines @@
   RawString* GenerateUserVisibleName() const;
   void set_signature_function(const Function& value) const;
   void set_signature_type(const AbstractType& value) const;
   void set_state_bits(intptr_t bits) const;
 
   void set_constants(const Array& value) const;
 
   void set_canonical_types(const Object& value) const;
   RawObject* canonical_types() const;
 
-  RawCode* spare_allocation_stub() const {
-    return raw_ptr()->spare_allocation_stub_;
-  }
-
   RawArray* invocation_dispatcher_cache() const;
   void set_invocation_dispatcher_cache(const Array& cache) const;
   RawFunction* CreateInvocationDispatcher(const String& target_name,
                                           const Array& args_desc,
                                           RawFunction::Kind kind) const;
 
   void CalculateFieldOffsets() const;
 
   // functions_hash_table is in use iff there are at least this many functions.
   static const intptr_t kFunctionLookupHashTreshold = 16;
@@ skipping 2469 matching lines @@
 
   RawDeoptInfo* GetDeoptInfoAtPc(
       uword pc, ICData::DeoptReasonId* deopt_reason) const;
 
   // Returns null if there is no static call at 'pc'.
   RawFunction* GetStaticCallTargetFunctionAt(uword pc) const;
   // Returns null if there is no static call at 'pc'.
   RawCode* GetStaticCallTargetCodeAt(uword pc) const;
   // Aborts if there is no static call at 'pc'.
   void SetStaticCallTargetCodeAt(uword pc, const Code& code) const;
+  void SetStubCallTargetCodeAt(uword pc, const Code& code) const;
 
   void Disassemble(DisassemblyFormatter* formatter = NULL) const;
 
   class Comments : public ZoneAllocated {
    public:
     static Comments& New(intptr_t count);
 
     intptr_t Length() const;
 
     void SetPCOffsetAt(intptr_t idx, intptr_t pc_offset);
@@ skipping 3696 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_