[serializer] tweak startup serializer for warming up.

src/api.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/api.h"
 
 #include <string.h>  // For memcpy, strlen.
 #ifdef V8_USE_ADDRESS_SANITIZER
 #include <sanitizer/asan_interface.h>
 #endif  // V8_USE_ADDRESS_SANITIZER
@@ skipping 483 matching lines @@
   ArrayBufferAllocator allocator;
   i::Isolate* internal_isolate = new i::Isolate(true);
   internal_isolate->set_array_buffer_allocator(&allocator);
   internal_isolate->set_snapshot_blob(&cold_snapshot_blob);
   Isolate* isolate = reinterpret_cast<Isolate*>(internal_isolate);
 
   {
     Isolate::Scope isolate_scope(isolate);
     i::Snapshot::Initialize(internal_isolate);
     Persistent<Context> context;
+    bool success;
     {
       HandleScope handle_scope(isolate);
-      Local<Context> warmup_context = Context::New(isolate);
-      if (RunExtraCode(isolate, warmup_context, warmup_source, "<warm-up>")) {
-        Local<Context> fresh_context = Context::New(isolate);
-        context.Reset(isolate, fresh_context);
-      }
+      Local<Context> new_context = Context::New(isolate);
+      success = RunExtraCode(isolate, new_context, warmup_source, "<warm-up>");
+    }
+    if (success) {
+      HandleScope handle_scope(isolate);
+      isolate->ContextDisposedNotification(false);
+      Local<Context> new_context = Context::New(isolate);
+      context.Reset(isolate, new_context);
     }
 
     i::Snapshot::Metadata metadata;
     metadata.set_embeds_script(i::Snapshot::EmbedsScript(internal_isolate));
 
     result = SerializeIsolateAndContext(
         isolate, &context, metadata, i::StartupSerializer::KEEP_FUNCTION_CODE);
     DCHECK(context.IsEmpty());
   }
   isolate->Dispose();
@@ skipping 8232 matching lines @@
   Address callback_address =
       reinterpret_cast<Address>(reinterpret_cast<intptr_t>(callback));
   VMState<EXTERNAL> state(isolate);
   ExternalCallbackScope call_scope(isolate, callback_address);
   callback(info);
 }
 
 
 }  // namespace internal
 }  // namespace v8