Reland "Use same blob format for internal and external snapshots."

src/natives-external.cc

 // Copyright 2014 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/natives.h"
 
 #include "src/base/logging.h"
 #include "src/list.h"
 #include "src/list-inl.h"
 #include "src/snapshot-source-sink.h"
 #include "src/vector.h"
 
+#ifndef V8_USE_EXTERNAL_STARTUP_DATA
+#error natives-external.cc is used only for the external snapshot build.
+#endif  // V8_USE_EXTERNAL_STARTUP_DATA
+
+
 namespace v8 {
 namespace internal {
 
 
 /**
  * NativesStore stores the 'native' (builtin) JS libraries.
  *
  * NativesStore needs to be initialized before using V8, usually by the
  * embedder calling v8::SetNativesDataBlob, which calls SetNativesFromFile
  * below.
@@ skipping 112 matching lines @@
 
 /**
  * Read the Natives (library sources) blob, as generated by js2c + the build
  * system.
  */
 void SetNativesFromFile(StartupData* natives_blob) {
   DCHECK(natives_blob);
   DCHECK(natives_blob->data);
   DCHECK(natives_blob->raw_size > 0);
 
-  SnapshotByteSource bytes(reinterpret_cast<const byte*>(natives_blob->data),
-                           natives_blob->raw_size);
+  SnapshotByteSource bytes(natives_blob->data, natives_blob->raw_size);
   NativesHolder<CORE>::set(NativesStore::MakeFromScriptsSource(&bytes));
   NativesHolder<EXPERIMENTAL>::set(NativesStore::MakeFromScriptsSource(&bytes));
   DCHECK(!bytes.HasMore());
 }
 
 
 // Implement NativesCollection<T> bsaed on NativesHolder + NativesStore.
 //
 // (The callers expect a purely static interface, since this is how the
 //  natives are usually compiled in. Since we implement them based on
@@ skipping 24 matching lines @@
   return NativesHolder<type>::get()->GetScriptName(index);
 }
 
 template <NativeType type>
 Vector<const char> NativesCollection<type>::GetScriptsSource() {
   return NativesHolder<type>::get()->GetScriptsSource();
 }
 
 
 // The compiler can't 'see' all uses of the static methods and hence
-// my chose to elide them. This we'll explicitly instantiate these.
+// my choice to elide them. This we'll explicitly instantiate these.
 template class NativesCollection<CORE>;
 template class NativesCollection<EXPERIMENTAL>;
 
 }  // namespace v8::internal
 }  // namespace v8