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

runtime/vm/raw_object_snapshot.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/native_entry.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 DECLARE_FLAG(int, optimization_counter_threshold);
@@ skipping 1274 matching lines @@
         intptr_t raw_value = reader->Read<intptr_t>();
         result.SetRawValueAt(i, raw_value);
         break;
       }
       case ObjectPool::kExternalLabel: {
         // TODO(rmacnak): Relocate.
         intptr_t raw_value = reader->Read<intptr_t>();
         result.SetRawValueAt(i, raw_value);
         break;
       }
+      case ObjectPool::kNativeEntry: {
+        // Read nothing. Initialize with the lazy link entry.
+        uword entry = reinterpret_cast<uword>(&NativeEntry::LinkNativeCall);
+#if defined(USING_SIMULATOR)
+        entry = Simulator::RedirectExternalReference(
+            entry, Simulator::kBootstrapNativeCall, NativeEntry::kNumArguments);
+#endif
+        result.SetRawValueAt(i, entry);
+        break;
+      }
       default:
         UNREACHABLE();
     }
   }
 
   return result.raw();
 }
 
 
 void RawObjectPool::WriteTo(SnapshotWriter* writer,
@@ skipping 23 matching lines @@
       case ObjectPool::kTaggedObject:
         writer->WriteObjectImpl(entry.raw_obj_, kAsReference);
         break;
       case ObjectPool::kImmediate:
         writer->Write<intptr_t>(entry.raw_value_);
         break;
       case ObjectPool::kExternalLabel:
         // TODO(rmacnak): Write symbolically.
         writer->Write<intptr_t>(entry.raw_value_);
         break;
+      case ObjectPool::kNativeEntry:
+        // Write nothing. Will initialize with the lazy link entry.
+        break;
       default:
         UNREACHABLE();
     }
   }
 }
 
 
 RawPcDescriptors* PcDescriptors::ReadFrom(SnapshotReader* reader,
                                           intptr_t object_id,
                                           intptr_t tags,
@@ skipping 1898 matching lines @@
     // We do not allow objects with native fields in an isolate message.
     writer->SetWriteException(Exceptions::kArgument,
                               "Illegal argument in isolate message"
                               " : (object is a UserTag)");
   } else {
     UNREACHABLE();
   }
 }
 
 }  // namespace dart