Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Unified Diff: src/setup-isolate-full.cc

Issue 2841993002: Revert of [snapshot] full setup delegate should also be able to deserialize. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/setup-isolate-deserialize.cc ('k') | src/snapshot/deserializer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « src/setup-isolate-deserialize.cc ('k') | src/snapshot/deserializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698