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

Unified Diff: src/compiler.cc

Issue 1960043002: [turbofan] Remove deprecated --turbo-osr flag. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | src/flag-definitions.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/compiler.cc
diff --git a/src/compiler.cc b/src/compiler.cc
index 8eb6ff577308015c0ec7ee0e7984d04d4e43ac81..1fe623bbc9aefbd2765ba8b3657bef92d78ede1f 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -599,7 +599,7 @@ bool Renumber(ParseInfo* parse_info) {
return true;
}
-bool UseTurboFan(Handle<SharedFunctionInfo> shared, BailoutId osr_ast_id) {
+bool UseTurboFan(Handle<SharedFunctionInfo> shared) {
bool optimization_disabled = shared->optimization_disabled();
bool dont_crankshaft = shared->dont_crankshaft();
@@ -616,13 +616,8 @@ bool UseTurboFan(Handle<SharedFunctionInfo> shared, BailoutId osr_ast_id) {
// 3. Explicitly enabled by the command-line filter.
bool passes_turbo_filter = shared->PassesFilter(FLAG_turbo_filter);
- // If this is OSR request, OSR must be enabled by Turbofan.
- bool passes_osr_test = FLAG_turbo_osr || osr_ast_id.IsNone();
-
- return (is_turbofanable_asm ||
- is_unsupported_by_crankshaft_but_turbofanable ||
- passes_turbo_filter) &&
- passes_osr_test;
+ return is_turbofanable_asm || is_unsupported_by_crankshaft_but_turbofanable ||
+ passes_turbo_filter;
}
bool GetOptimizedCodeNow(CompilationJob* job) {
@@ -725,7 +720,7 @@ MaybeHandle<Code> GetOptimizedCode(Handle<JSFunction> function,
VMState<COMPILER> state(isolate);
DCHECK(!isolate->has_pending_exception());
PostponeInterruptsScope postpone(isolate);
- bool use_turbofan = UseTurboFan(shared, osr_ast_id);
+ bool use_turbofan = UseTurboFan(shared);
base::SmartPointer<CompilationJob> job(
use_turbofan ? compiler::Pipeline::NewCompilationJob(function)
: new HCompilationJob(function));
@@ -927,18 +922,6 @@ MaybeHandle<Code> GetLazyCode(Handle<JSFunction> function) {
}
}
- // If the debugger is active, do not compile with turbofan unless we can
- // deopt from turbofan code.
- if (FLAG_turbo_asm && function->shared()->asm_function() &&
- (FLAG_turbo_asm_deoptimization || !isolate->debug()->is_active()) &&
- !FLAG_turbo_osr) {
- Handle<Code> code;
- if (GetOptimizedCode(function, Compiler::NOT_CONCURRENT).ToHandle(&code)) {
- DCHECK(function->shared()->is_compiled());
- return code;
- }
- }
-
if (function->shared()->is_compiled()) {
return Handle<Code>(function->shared()->code());
}
« no previous file with comments | « no previous file | src/flag-definitions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698