Cleanup native, collected, and stub code handling in profiler

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 3257 matching lines @@
   }
 
   RawExceptionHandlers* exception_handlers() const {
     return raw_ptr()->exception_handlers_;
   }
   void set_exception_handlers(const ExceptionHandlers& handlers) const {
     ASSERT(handlers.IsOld());
     StorePointer(&raw_ptr()->exception_handlers_, handlers.raw());
   }
 
+  bool OwnerIsFunction() const {
+    return raw_ptr()->owner_->IsHeapObject();
+  }
+
+  bool OwnerIsNotNullFunction() const {
+    return (raw_ptr()->owner_->IsHeapObject()) &&
+           (raw_ptr()->owner_ != Function::null());
+  }
+
+  bool OwnerIsAllocationStub() const {
+    return !raw_ptr()->owner_->IsHeapObject();
+  }
+
   RawFunction* function() const {
-    return raw_ptr()->function_;
+    ASSERT(OwnerIsFunction());
+    return reinterpret_cast<RawFunction*>(raw_ptr()->owner_);
   }
-  void set_function(const Function& function) const {
+
+  RawSmi* allocation_stub_class_id() const {
+    ASSERT(OwnerIsAllocationStub());
+    return reinterpret_cast<RawSmi*>(raw_ptr()->owner_);
+  }
+
+  void set_owner_function(const Function& function) const {

[turnidge, 2014/02/28 19:23:37]

Consider camel-case for this function and the one below, as they are less like
straight setters.  Your call.

     ASSERT(function.IsOld());
-    StorePointer(&raw_ptr()->function_, function.raw());
+    StorePointer(&raw_ptr()->owner_,
+                 reinterpret_cast<RawObject*>(function.raw()));
+  }
+
+  void set_owner_allocation_stub_class_id(RawSmi* cid) const {
+    ASSERT(!cid->IsHeapObject());
+    raw_ptr()->owner_ = reinterpret_cast<RawObject*>(cid);
   }
 
   // We would have a VisitPointers function here to traverse all the
   // embedded objects in the instructions using pointer_offsets.
 
   static const intptr_t kBytesPerElement =
       sizeof(reinterpret_cast<RawCode*>(0)->data_[0]);
   static const intptr_t kMaxElements = kSmiMax / kBytesPerElement;
 
   static intptr_t InstanceSize() {
     ASSERT(sizeof(RawCode) == OFFSET_OF(RawCode, data_));
     return 0;
   }
   static intptr_t InstanceSize(intptr_t len) {
     ASSERT(0 <= len && len <= kMaxElements);
     return RoundedAllocationSize(sizeof(RawCode) + (len * kBytesPerElement));
   }
   static RawCode* FinalizeCode(const Function& function,
                                Assembler* assembler,
                                bool optimized = false);
   static RawCode* FinalizeCode(const char* name,
                                Assembler* assembler,
                                bool optimized = false);
   static RawCode* LookupCode(uword pc);
+  static RawCode* LookupCodeInVmIsolate(uword pc);
 
   int32_t GetPointerOffsetAt(int index) const {
     return *PointerOffsetAddrAt(index);
   }
   intptr_t GetTokenIndexOfPC(uword pc) const;
 
   // Find pc, return 0 if not found.
   uword GetPatchCodePc() const;
   uword GetLazyDeoptPc() const;
 
@@ skipping 58 matching lines @@
     ASSERT(index >= 0);
     ASSERT(index < pointer_offsets_length());
     // TODO(iposva): Unit test is missing for this functionality.
     return &raw_ptr()->data_[index];
   }
   void SetPointerOffsetAt(int index, int32_t offset_in_instructions) {
     *PointerOffsetAddrAt(index) = offset_in_instructions;
   }
 
   intptr_t BinarySearchInSCallTable(uword pc) const;
+  static RawCode* LookupCodeInIsolate(Isolate* isolate, uword pc);
 
   // New is a private method as RawInstruction and RawCode objects should
   // only be created using the Code::FinalizeCode method. This method creates
   // the RawInstruction and RawCode objects, sets up the pointer offsets
   // and links the two in a GC safe manner.
   static RawCode* New(intptr_t pointer_offsets_length);
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(Code, Object);
   friend class Class;
 
@@ skipping 1534 matching lines @@
       sizeof(RawInstance) + (2 * kWordSize);
   static const intptr_t kMaxElements = kSmiMax / kTwoByteChar;
 
   class CodePointIterator : public ValueObject {
    public:
     explicit CodePointIterator(const String& str)
         : str_(str),
           ch_(0),
           index_(-1),
           end_(str.Length()) {
+      ASSERT(!str_.IsNull());
     }
 
     CodePointIterator(const String& str, intptr_t start, intptr_t length)
         : str_(str),
           ch_(0),
           index_(start - 1),
           end_(start + length) {
       ASSERT(start >= 0);
       ASSERT(end_ <= str.Length());
     }
@@ skipping 1698 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_