| Index: runtime/vm/raw_object_snapshot.cc
|
| diff --git a/runtime/vm/raw_object_snapshot.cc b/runtime/vm/raw_object_snapshot.cc
|
| index 893c0de9439f97ad0ad4370b8840a3977aadf429..aa2d0d057d3d6a58e45821be4eea506f5b11b342 100644
|
| --- a/runtime/vm/raw_object_snapshot.cc
|
| +++ b/runtime/vm/raw_object_snapshot.cc
|
| @@ -1376,7 +1376,14 @@ void RawObjectPool::WriteTo(SnapshotWriter* writer,
|
| Entry& entry = ptr()->data()[i];
|
| switch (entry_type) {
|
| case ObjectPool::kTaggedObject: {
|
| - writer->WriteObjectImpl(entry.raw_obj_, kAsReference);
|
| + if (entry.raw_obj_ == StubCode::CallNativeCFunction_entry()->code()) {
|
| + // Natives can run while precompiling, becoming linked and switching
|
| + // their stub. Reset to the initial stub used for lazy-linking.
|
| + writer->WriteObjectImpl(
|
| + StubCode::CallBootstrapCFunction_entry()->code(), kAsReference);
|
| + } else {
|
| + writer->WriteObjectImpl(entry.raw_obj_, kAsReference);
|
| + }
|
| break;
|
| }
|
| case ObjectPool::kImmediate: {
|
|
|