Commit 55515c99 authored by mstarzinger's avatar mstarzinger Committed by Commit bot

[compiler] Remove obsolete GetUnoptimizedCodeCommon.

This removes an unnecessary abstraction from the implementation of the
compilation pipeline that is no longer needed by now.

R=bmeurer@chromium.org

Review URL: https://codereview.chromium.org/1868553002

Cr-Commit-Position: refs/heads/master@{#35313}
parent 56c7d4b4
...@@ -861,8 +861,7 @@ void InstallBaselineCompilationResult(CompilationInfo* info, ...@@ -861,8 +861,7 @@ void InstallBaselineCompilationResult(CompilationInfo* info,
} }
} }
MUST_USE_RESULT MaybeHandle<Code> GetUnoptimizedCodeCommon( MUST_USE_RESULT MaybeHandle<Code> GetUnoptimizedCode(CompilationInfo* info) {
CompilationInfo* info) {
VMState<COMPILER> state(info->isolate()); VMState<COMPILER> state(info->isolate());
PostponeInterruptsScope postpone(info->isolate()); PostponeInterruptsScope postpone(info->isolate());
...@@ -1026,21 +1025,6 @@ bool GetOptimizedCodeLater(CompilationInfo* info) { ...@@ -1026,21 +1025,6 @@ bool GetOptimizedCodeLater(CompilationInfo* info) {
return true; return true;
} }
MaybeHandle<Code> GetUnoptimizedCode(Handle<JSFunction> function) {
DCHECK(!function->GetIsolate()->has_pending_exception());
DCHECK(!function->is_compiled());
if (function->shared()->is_compiled()) {
return Handle<Code>(function->shared()->code());
}
CompilationInfoWithZone info(function);
Handle<Code> result;
ASSIGN_RETURN_ON_EXCEPTION(info.isolate(), result,
GetUnoptimizedCodeCommon(&info),
Code);
return result;
}
MaybeHandle<Code> GetOptimizedCode(Handle<JSFunction> function, MaybeHandle<Code> GetOptimizedCode(Handle<JSFunction> function,
Compiler::ConcurrencyMode mode, Compiler::ConcurrencyMode mode,
BailoutId osr_ast_id = BailoutId::None(), BailoutId osr_ast_id = BailoutId::None(),
...@@ -1137,8 +1121,7 @@ MaybeHandle<Code> GetLazyCode(Handle<JSFunction> function) { ...@@ -1137,8 +1121,7 @@ MaybeHandle<Code> GetLazyCode(Handle<JSFunction> function) {
CompilationInfoWithZone info(function); CompilationInfoWithZone info(function);
Handle<Code> result; Handle<Code> result;
ASSIGN_RETURN_ON_EXCEPTION(isolate, result, GetUnoptimizedCodeCommon(&info), ASSIGN_RETURN_ON_EXCEPTION(isolate, result, GetUnoptimizedCode(&info), Code);
Code);
if (FLAG_always_opt) { if (FLAG_always_opt) {
Handle<Code> opt_code; Handle<Code> opt_code;
...@@ -1192,7 +1175,7 @@ bool CompileEvalForDebugging(Handle<JSFunction> function, ...@@ -1192,7 +1175,7 @@ bool CompileEvalForDebugging(Handle<JSFunction> function,
bool CompileForDebugging(CompilationInfo* info) { bool CompileForDebugging(CompilationInfo* info) {
info->MarkAsDebug(); info->MarkAsDebug();
if (GetUnoptimizedCodeCommon(info).is_null()) { if (GetUnoptimizedCode(info).is_null()) {
info->isolate()->clear_pending_exception(); info->isolate()->clear_pending_exception();
return false; return false;
} }
...@@ -1385,8 +1368,13 @@ bool Compiler::CompileOptimized(Handle<JSFunction> function, ...@@ -1385,8 +1368,13 @@ bool Compiler::CompileOptimized(Handle<JSFunction> function,
code = Handle<Code>(function->shared()->code(), isolate); code = Handle<Code>(function->shared()->code(), isolate);
if (code->kind() != Code::FUNCTION && if (code->kind() != Code::FUNCTION &&
code->kind() != Code::OPTIMIZED_FUNCTION) { code->kind() != Code::OPTIMIZED_FUNCTION) {
if (!GetUnoptimizedCode(function).ToHandle(&code)) { DCHECK(!isolate->has_pending_exception());
return false; DCHECK(!function->is_compiled());
if (!function->shared()->is_compiled()) {
CompilationInfoWithZone info(function);
if (!GetUnoptimizedCode(&info).ToHandle(&code)) {
return false;
}
} }
} }
function->ReplaceCode(*code); function->ReplaceCode(*code);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment