| Index: src/setup-isolate-full.cc
|
| diff --git a/src/setup-isolate-full.cc b/src/setup-isolate-full.cc
|
| index 9dd7e64d29f5c55ab47cb242731d80b566bd9790..007d4f7bf38398f720b692241ca2774856c7ef4d 100644
|
| --- a/src/setup-isolate-full.cc
|
| +++ b/src/setup-isolate-full.cc
|
| @@ -5,7 +5,6 @@
|
| #include "src/setup-isolate.h"
|
|
|
| #include "src/base/logging.h"
|
| -#include "src/interpreter/interpreter.h"
|
| #include "src/interpreter/setup-interpreter.h"
|
| #include "src/isolate.h"
|
|
|
| @@ -14,20 +13,30 @@
|
|
|
| void SetupIsolateDelegate::SetupBuiltins(Isolate* isolate,
|
| bool create_heap_objects) {
|
| +#ifdef V8_GYP_BUILD
|
| + // Compatibility hack to keep the deprecated GYP build working.
|
| if (create_heap_objects) {
|
| SetupBuiltinsInternal(isolate);
|
| } else {
|
| - DCHECK(isolate->snapshot_available());
|
| + isolate->builtins()->MarkInitialized();
|
| }
|
| + return;
|
| +#endif
|
| + DCHECK(create_heap_objects);
|
| + SetupBuiltinsInternal(isolate);
|
| }
|
|
|
| void SetupIsolateDelegate::SetupInterpreter(
|
| interpreter::Interpreter* interpreter, bool create_heap_objects) {
|
| +#ifdef V8_GYP_BUILD
|
| + // Compatibility hack to keep the deprecated GYP build working.
|
| if (create_heap_objects) {
|
| interpreter::SetupInterpreter::InstallBytecodeHandlers(interpreter);
|
| - } else {
|
| - DCHECK(interpreter->IsDispatchTableInitialized());
|
| }
|
| + return;
|
| +#endif
|
| + DCHECK(create_heap_objects);
|
| + interpreter::SetupInterpreter::InstallBytecodeHandlers(interpreter);
|
| }
|
|
|
| } // namespace internal
|
|
|