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

Unified Diff: src/bootstrapper.cc

Issue 148293020: Merge experimental/a64 to bleeding_edge. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Remove ARM from OWNERS Created 6 years, 10 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/atomicops_internals_a64_gcc.h ('k') | src/builtins.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/bootstrapper.cc
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index 672e830bb4e0422ed9426443d0e384a734438dfe..8587b846917363de556ceb578a1ca493222c40e6 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -2637,8 +2637,10 @@ Genesis::Genesis(Isolate* isolate,
MakeFunctionInstancePrototypeWritable();
- if (!ConfigureGlobalObjects(global_template)) return;
- isolate->counters()->contexts_created_from_scratch()->Increment();
+ if (!FLAG_disable_native_files) {
+ if (!ConfigureGlobalObjects(global_template)) return;
+ isolate->counters()->contexts_created_from_scratch()->Increment();
+ }
}
// Initialize experimental globals and install experimental natives.
« no previous file with comments | « src/atomicops_internals_a64_gcc.h ('k') | src/builtins.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698