Track which entries in the ObjectPool are native entries, and reset them when loading a precompiled…

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 11035 matching lines @@
       switch (InfoAt(i)) {
       case ObjectPool::kTaggedObject:
         obj = ObjectAt(i);
         jsarr.AddValue(obj);
         break;
       case ObjectPool::kImmediate:
         imm = RawValueAt(i);
         jsarr.AddValue64(imm);
         break;
       case ObjectPool::kExternalLabel:
+      case ObjectPool::kNativeEntry:
         imm = RawValueAt(i);
         jsarr.AddValueF("0x%" Px, imm);
         break;
       default:
         UNREACHABLE();
       }
     }
   }
 }
 
 
 static const char* DescribeExternalLabel(uword addr) {
   const char* stub_name = StubCode::NameOfStub(addr);
   if (stub_name != NULL) {
     return stub_name;
   }
 
-  RuntimeFunctionId rt_id = RuntimeEntry::RuntimeFunctionIdFromAddress(addr);
-  if (rt_id != kNoRuntimeFunctionId) {
-    return "runtime entry";
-  }
-
-  if (addr == NativeEntry::LinkNativeCallLabel().address()) {
-    return "link native";
-  }
-
   return "UNKNOWN";
 }
 
 
 void ObjectPool::DebugPrint() const {
   ISL_Print("Object Pool: {\n");
   for (intptr_t i = 0; i < Length(); i++) {
     intptr_t offset = OffsetFromIndex(i);
     ISL_Print("  %" Pd " PP+0x%" Px ": ", i, offset);
     if (InfoAt(i) == kTaggedObject) {
       RawObject* obj = ObjectAt(i);
       ISL_Print("0x%" Px " %s (obj)\n",
           reinterpret_cast<uword>(obj),
           Object::Handle(obj).ToCString());
     } else if (InfoAt(i) == kExternalLabel) {
       uword addr = RawValueAt(i);
       ISL_Print("0x%" Px " (external label: %s)\n",
                 addr, DescribeExternalLabel(addr));
+    } else if (InfoAt(i) == kNativeEntry) {
+      ISL_Print("0x%" Px " (native entry)\n", RawValueAt(i));
     } else {
       ISL_Print("0x%" Px " (raw)\n", RawValueAt(i));
     }
   }
   ISL_Print("}\n");
 }
 
 
 intptr_t PcDescriptors::Length() const {
   return raw_ptr()->length_;
@@ skipping 10435 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart