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

runtime/vm/object.cc

Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 86d461ac28b466c3ba800752a4cfa955947de53c..59a4acfc768a4a678229f549f455bd36c20df63c 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -11014,6 +11014,7 @@ void ObjectPool::PrintJSONImpl(JSONStream* stream, bool ref) const {
         jsarr.AddValue64(imm);
         break;
       case ObjectPool::kExternalLabel:
+      case ObjectPool::kNativeEntry:
         imm = RawValueAt(i);
         jsarr.AddValueF("0x%" Px, imm);
         break;
@@ -11031,15 +11032,6 @@ static const char* DescribeExternalLabel(uword addr) {
     return stub_name;
   }
 
-  RuntimeFunctionId rt_id = RuntimeEntry::RuntimeFunctionIdFromAddress(addr);
-  if (rt_id != kNoRuntimeFunctionId) {
-    return "runtime entry";
-  }
-
-  if (addr == NativeEntry::LinkNativeCallLabel().address()) {
-    return "link native";
-  }
-
   if (addr == reinterpret_cast<uword>(Symbols::PredefinedAddress())) {
     return "predefined symbols";
   }
@@ -11062,6 +11054,8 @@ void ObjectPool::DebugPrint() const {
       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));
     }