Put V8 extras into the snapshot

src/snapshot/serialize.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/v8.h"
 
 #include "src/accessors.h"
 #include "src/api.h"
 #include "src/base/platform/platform.h"
 #include "src/bootstrapper.h"
@@ skipping 559 matching lines @@
   }
 
   // Update data pointers to the external strings containing natives sources.
   for (int i = 0; i < Natives::GetBuiltinsCount(); i++) {
     Object* source = isolate_->heap()->natives_source_cache()->get(i);
     if (!source->IsUndefined()) {
       ExternalOneByteString::cast(source)->update_data_cache();
     }
   }
 
+  for (int i = 0; i < ExtraNatives::GetBuiltinsCount(); i++) {
+    Object* source = isolate_->heap()->extra_natives_source_cache()->get(i);

[Yang, 2015/08/13 12:28:24]

now that we have this code three times, can we templatize it to reduce duplicate
code?

We have those GetCache templates in bootstrapper.cc, which we could move to
natives.h/natives.cc as methods of NativesCollection<>. We can then use them
here.

+    if (!source->IsUndefined()) {
+      ExternalOneByteString::cast(source)->update_data_cache();
+    }
+  }
+
   for (int i = 0; i < CodeStubNatives::GetBuiltinsCount(); i++) {
     Object* source = isolate_->heap()->code_stub_natives_source_cache()->get(i);
     if (!source->IsUndefined()) {
       ExternalOneByteString::cast(source)->update_data_cache();
     }
   }
 
   FlushICacheForNewCodeObjects();
 
   // Issue code events for newly deserialized code objects.
@@ skipping 584 matching lines @@
         // If we get here then that indicates that you have a mismatch between
         // the number of GC roots when serializing and deserializing.
         CHECK(false);
         break;
 
       case kNativesStringResource:
         current = CopyInNativesSource(Natives::GetScriptSource(source_.Get()),
                                       current);
         break;
 
+      case kExtraNativesStringResource:
+        current = CopyInNativesSource(
+            ExtraNatives::GetScriptSource(source_.Get()), current);
+        break;
+
       case kCodeStubNativesStringResource:
         current = CopyInNativesSource(
             CodeStubNatives::GetScriptSource(source_.Get()), current);
         break;
 
       // Deserialize raw data of variable length.
       case kVariableRawData: {
         int size_in_bytes = source_.GetInt();
         byte* raw_data_out = reinterpret_cast<byte*>(current);
         source_.CopyRaw(raw_data_out, size_in_bytes);
@@ skipping 991 matching lines @@
     v8::String::ExternalOneByteStringResource** resource_pointer) {
   Address references_start = reinterpret_cast<Address>(resource_pointer);
   OutputRawData(references_start);
   if (SerializeExternalNativeSourceString(
           Natives::GetBuiltinsCount(), resource_pointer,
           serializer_->isolate()->heap()->natives_source_cache(),
           kNativesStringResource)) {
     return;
   }
   if (SerializeExternalNativeSourceString(
+          ExtraNatives::GetBuiltinsCount(), resource_pointer,
+          serializer_->isolate()->heap()->extra_natives_source_cache(),

[Yang, 2015/08/13 12:28:24]

We can then also replace the third argument with ExtraNatives::GetCache().

+          kExtraNativesStringResource)) {
+    return;
+  }
+  if (SerializeExternalNativeSourceString(
           CodeStubNatives::GetBuiltinsCount(), resource_pointer,
           serializer_->isolate()->heap()->code_stub_natives_source_cache(),
           kCodeStubNativesStringResource)) {
     return;
   }
   // One of the strings in the natives cache should match the resource.  We
   // don't expect any other kinds of external strings here.
   UNREACHABLE();
 }
 
@@ skipping 595 matching lines @@
   SerializedCodeData* scd = new SerializedCodeData(cached_data);
   SanityCheckResult r = scd->SanityCheck(isolate, source);
   if (r == CHECK_SUCCESS) return scd;
   cached_data->Reject();
   source->GetIsolate()->counters()->code_cache_reject_reason()->AddSample(r);
   delete scd;
   return NULL;
 }
 }  // namespace internal
 }  // namespace v8