Quick-and-dirty fixes for on-demand snapshot.

src/bootstrapper.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/bootstrapper.h"
 
 #include "src/accessors.h"
 #include "src/code-stubs.h"
 #include "src/extensions/externalize-string-extension.h"
 #include "src/extensions/free-buffer-extension.h"
@@ skipping 212 matching lines @@
   Handle<JSFunction> InstallInternalArray(Handle<JSBuiltinsObject> builtins,
                                           const char* name,
                                           ElementsKind elements_kind);
   bool InstallNatives();
 
   void InstallTypedArray(
       const char* name,
       ElementsKind elements_kind,
       Handle<JSFunction>* fun,
       Handle<Map>* external_map);
-  bool InstallExperimentalNatives();
+  bool InstallExperimentalNatives(bool include_shipping);
   void InstallBuiltinFunctionIds();
   void InstallJSFunctionResultCaches();
   void InitializeNormalizedMapCaches();
 
   enum ExtensionTraversalState {
     UNVISITED, VISITED, INSTALLED
   };
 
   class ExtensionStates {
    public:
@@ skipping 1094 matching lines @@
     // Set up the call-as-constructor delegate.
     Handle<Code> code =
         Handle<Code>(isolate->builtins()->builtin(
             Builtins::kHandleApiCallAsConstructor));
     Handle<JSFunction> delegate = factory->NewFunction(
         factory->empty_string(), code, JS_OBJECT_TYPE, JSObject::kHeaderSize);
     native_context()->set_call_as_constructor_delegate(*delegate);
     delegate->shared()->DontAdaptArguments();
   }
 
+#ifdef V8_ON_DEMAND_SNAPSHOT
+#define FEATURE_INITIALIZE_GLOBAL(id, descr) InitializeGlobal_##id();   
+  HARMONY_SHIPPING(FEATURE_INITIALIZE_GLOBAL)   
+#undef FEATURE_INITIALIZE_GLOBAL        
+#endif
+ 
+
   // Initialize the embedder data slot.
   Handle<FixedArray> embedder_data = factory->NewFixedArray(3);
   native_context()->set_embedder_data(*embedder_data);
 }
 
 
 void Genesis::InstallTypedArray(
     const char* name,
     ElementsKind elements_kind,
     Handle<JSFunction>* fun,
@@ skipping 14 matching lines @@
   ElementsKind external_kind = GetNextTransitionElementsKind(elements_kind);
   *external_map = Map::AsElementsKind(initial_map, external_kind);
 }
 
 
 void Genesis::InitializeExperimentalGlobal() {
 #define FEATURE_INITIALIZE_GLOBAL(id, descr) InitializeGlobal_##id();
 
   HARMONY_INPROGRESS(FEATURE_INITIALIZE_GLOBAL)
   HARMONY_STAGED(FEATURE_INITIALIZE_GLOBAL)
+#ifndef V8_ON_DEMAND_SNAPSHOT
   HARMONY_SHIPPING(FEATURE_INITIALIZE_GLOBAL)
+#endif
 #undef FEATURE_INITIALIZE_GLOBAL
 }
 
 
 bool Genesis::CompileBuiltin(Isolate* isolate, int index) {
   Vector<const char> name = Natives::GetScriptName(index);
+  printf("CompileBuiltin:%*s\n", name.length(), name.start());
   Handle<String> source_code =
       isolate->bootstrapper()->NativesSourceLookup(index);
   return CompileNative(isolate, name, source_code);
 }
 
 
 bool Genesis::CompileExperimentalBuiltin(Isolate* isolate, int index) {
   Vector<const char> name = ExperimentalNatives::GetScriptName(index);
+  printf("CompileExperimentalBuiltin:%*s\n", name.length(), name.start());
   Factory* factory = isolate->factory();
   Handle<String> source_code;
   ASSIGN_RETURN_ON_EXCEPTION_VALUE(
       isolate, source_code,
       factory->NewStringFromAscii(ExperimentalNatives::GetScriptSource(index)),
       false);
   return CompileNative(isolate, name, source_code);
 }
 
 
@@ skipping 146 matching lines @@
                  observers_begin_perform_splice);
   INSTALL_NATIVE(JSFunction, "EndPerformSplice",
                  observers_end_perform_splice);
   INSTALL_NATIVE(JSFunction, "NativeObjectObserve",
                  native_object_observe);
   INSTALL_NATIVE(JSFunction, "NativeObjectGetNotifier",
                  native_object_get_notifier);
   INSTALL_NATIVE(JSFunction, "NativeObjectNotifierPerformChange",
                  native_object_notifier_perform_change);
   INSTALL_NATIVE(JSFunction, "ArrayValues", array_values_iterator);
+
+        
+#ifdef V8_ON_DEMAND_SNAPSHOT
+#define INSTALL_NATIVE_FUNCTIONS_FOR(id, descr) InstallNativeFunctions_##id();  
+  HARMONY_SHIPPING(INSTALL_NATIVE_FUNCTIONS_FOR)        
+#undef INSTALL_NATIVE_FUNCTIONS_FOR
+#endif // V8_ON_DEMAND_SNAPSHOT
 }
 
 
 void Genesis::InstallExperimentalNativeFunctions() {
   if (FLAG_harmony_proxies) {
     INSTALL_NATIVE(JSFunction, "DerivedHasTrap", derived_has_trap);
     INSTALL_NATIVE(JSFunction, "DerivedGetTrap", derived_get_trap);
     INSTALL_NATIVE(JSFunction, "DerivedSetTrap", derived_set_trap);
     INSTALL_NATIVE(JSFunction, "ProxyEnumerate", proxy_enumerate);
   }
 
 #define INSTALL_NATIVE_FUNCTIONS_FOR(id, descr) InstallNativeFunctions_##id();
   HARMONY_INPROGRESS(INSTALL_NATIVE_FUNCTIONS_FOR)
   HARMONY_STAGED(INSTALL_NATIVE_FUNCTIONS_FOR)
+#ifndef V8_ON_DEMAND_SNAPSHOT
   HARMONY_SHIPPING(INSTALL_NATIVE_FUNCTIONS_FOR)
+#endif
 #undef INSTALL_NATIVE_FUNCTIONS_FOR
 }
 
 
 #define EMPTY_NATIVE_FUNCTIONS_FOR_FEATURE(id) \
   void Genesis::InstallNativeFunctions_##id() {}
 
 EMPTY_NATIVE_FUNCTIONS_FOR_FEATURE(harmony_scoping)
 EMPTY_NATIVE_FUNCTIONS_FOR_FEATURE(harmony_modules)
 EMPTY_NATIVE_FUNCTIONS_FOR_FEATURE(harmony_strings)
@@ skipping 414 matching lines @@
   // Install natives.
   for (int i = Natives::GetDebuggerCount();
        i < Natives::GetBuiltinsCount();
        i++) {
     if (!CompileBuiltin(isolate(), i)) return false;
     // TODO(ager): We really only need to install the JS builtin
     // functions on the builtins object after compiling and running
     // runtime.js.
     if (!InstallJSBuiltins(builtins)) return false;
   }
-
+#if V8_ON_DEMAND_SNAPSHOT
+  InstallExperimentalNatives(true);
+#endif // V8_ON_DEMAND_SNAPSHOT
+    
   InstallNativeFunctions();
 
   // Store the map for the string prototype after the natives has been compiled
   // and the String function has been set up.
   Handle<JSFunction> string_function(native_context()->string_function());
   DCHECK(JSObject::cast(
       string_function->initial_map()->prototype())->HasFastProperties());
   native_context()->set_string_function_prototype_map(
       HeapObject::cast(string_function->initial_map()->prototype())->map());
 
@@ skipping 127 matching lines @@
   }
 
 #ifdef VERIFY_HEAP
   builtins->ObjectVerify();
 #endif
 
   return true;
 }
 
 
-bool Genesis::InstallExperimentalNatives() {
+bool Genesis::InstallExperimentalNatives(bool include_shipping) {
   static const char* harmony_arrays_natives[] = {
       "native harmony-array.js", "native harmony-typedarray.js", NULL};
   static const char* harmony_array_includes_natives[] = {
       "native harmony-array-includes.js", NULL};
   static const char* harmony_proxies_natives[] = {"native proxy.js", NULL};
   static const char* harmony_strings_natives[] = {"native harmony-string.js",
                                                   NULL};
   static const char* harmony_classes_natives[] = {"native harmony-classes.js",
                                                   NULL};
   static const char* harmony_modules_natives[] = {NULL};
@@ skipping 17 matching lines @@
     for (size_t j = 0; id##_natives[j] != NULL; j++) {                        \
       Vector<const char> script_name = ExperimentalNatives::GetScriptName(i); \
       if (strncmp(script_name.start(), id##_natives[j],                       \
                   script_name.length()) == 0) {                               \
         if (!CompileExperimentalBuiltin(isolate(), i)) return false;          \
       }                                                                       \
     }                                                                         \
   }
     HARMONY_INPROGRESS(INSTALL_EXPERIMENTAL_NATIVES);
     HARMONY_STAGED(INSTALL_EXPERIMENTAL_NATIVES);
+#ifdef V8_ON_DEMAND_SNAPSHOT
+    if (include_shipping) {    
+#endif
     HARMONY_SHIPPING(INSTALL_EXPERIMENTAL_NATIVES);
+
+#ifdef V8_ON_DEMAND_SNAPSHOT
+    }
+#endif
+
 #undef INSTALL_EXPERIMENTAL_NATIVES
   }
 
   InstallExperimentalNativeFunctions();
   return true;
 }
 
 
 static void InstallBuiltinFunctionId(Handle<JSObject> holder,
                                      const char* function_name,
@@ skipping 544 matching lines @@
     InitializeNormalizedMapCaches();
     if (!InstallNatives()) return;
 
     MakeFunctionInstancePrototypeWritable();
 
     if (!ConfigureGlobalObjects(global_proxy_template)) return;
     isolate->counters()->contexts_created_from_scratch()->Increment();
   }
 
   // Install experimental natives.
-  if (!InstallExperimentalNatives()) return;
+  if (!InstallExperimentalNatives(false)) return;
   InitializeExperimentalGlobal();
 
   // We can't (de-)serialize typed arrays currently, but we are lucky: The state
   // of the random number generator needs no initialization during snapshot
   // creation time and we don't need trigonometric functions then.
   if (!isolate->serializer_enabled()) {
     // Initially seed the per-context random number generator using the
     // per-isolate random number generator.
     const int num_elems = 2;
     const int num_bytes = num_elems * sizeof(uint32_t);
@@ skipping 53 matching lines @@
   return from + sizeof(NestingCounterType);
 }
 
 
 // Called when the top-level V8 mutex is destroyed.
 void Bootstrapper::FreeThreadResources() {
   DCHECK(!IsActive());
 }
 
 } }  // namespace v8::internal