AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Remove obsolete JSFunction::IsOptimizable predicate.

Browse Source 
This just delegates to SharedFunctionInfo::optimization_disabled and
was primarily used for assertions. Removing it due to misleading name
because already optimized functions reported being "non-optimizable".

This relands commit 181d7b8597.

R=titzer@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#28577}
This commit is contained in:
mstarzinger 2015-05-22 03:05:16 -07:00 committed by Commit bot
parent 3ce81e193d
commit eb055cb3c4
6 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/objects-inl.h
View File

@ -6022,11 +6022,6 @@ bool JSFunction::IsOptimized() {
}
bool JSFunction::IsOptimizable() {
return code()->kind() == Code::FUNCTION && !shared()->optimization_disabled();
}
bool JSFunction::IsMarkedForOptimization() {
return code() == GetIsolate()->builtins()->builtin(
Builtins::kCompileOptimized);

8
src/objects.cc
View File

@ -9823,7 +9823,8 @@ void JSFunction::JSFunctionIterateBody(int object_size, ObjectVisitor* v) {
void JSFunction::MarkForOptimization() {
Isolate* isolate = GetIsolate();
DCHECK(!IsOptimized());
DCHECK(shared()->allows_lazy_compilation() || IsOptimizable());
DCHECK(shared()->allows_lazy_compilation() ||
!shared()->optimization_disabled());
set_code_no_write_barrier(
isolate->builtins()->builtin(Builtins::kCompileOptimized));
// No write barrier required, since the builtin is part of the root set.
@ -9847,7 +9848,8 @@ void JSFunction::AttemptConcurrentOptimization() {
}
DCHECK(!IsInOptimizationQueue());
DCHECK(!IsOptimized());
DCHECK(shared()->allows_lazy_compilation() || IsOptimizable());
DCHECK(shared()->allows_lazy_compilation() ||
!shared()->optimization_disabled());
DCHECK(isolate->concurrent_recompilation_enabled());
if (FLAG_trace_concurrent_recompilation) {
PrintF(" ** Marking ");
@ -9855,7 +9857,7 @@ void JSFunction::AttemptConcurrentOptimization() {
PrintF(" for concurrent recompilation.\n");
}
set_code_no_write_barrier(
GetIsolate()->builtins()->builtin(Builtins::kCompileOptimizedConcurrent));
isolate->builtins()->builtin(Builtins::kCompileOptimizedConcurrent));
// No write barrier required, since the builtin is part of the root set.
}

3
src/objects.h
View File

@ -7612,9 +7612,6 @@ class JSFunction: public JSObject {
// Tells whether or not this function has been optimized.
inline bool IsOptimized();
// Tells whether or not this function can be optimized.
inline bool IsOptimizable();
// Mark this function for lazy recompilation. The function will be
// recompiled the next time it is executed.
void MarkForOptimization();

4
src/runtime-profiler.cc
View File

@ -88,8 +88,6 @@ static void GetICCounts(SharedFunctionInfo* shared,
void RuntimeProfiler::Optimize(JSFunction* function, const char* reason) {
DCHECK(function->IsOptimizable());
if (FLAG_trace_opt && function->PassesFilter(FLAG_hydrogen_filter)) {
PrintF("[marking ");
function->ShortPrint();
@ -217,7 +215,7 @@ void RuntimeProfiler::OptimizeNow() {
}
continue;
}
if (!function->IsOptimizable()) continue;
if (function->IsOptimized()) continue;
int ticks = shared_code->profiler_ticks();

4
src/runtime/runtime-test.cc
View File

@ -88,7 +88,7 @@ RUNTIME_FUNCTION(Runtime_OptimizeFunctionOnNextCall) {
// The following assertion was lifted from the DCHECK inside
// JSFunction::MarkForOptimization().
RUNTIME_ASSERT(function->shared()->allows_lazy_compilation() ||
function->IsOptimizable());
!function->shared()->optimization_disabled());
// If the function is already optimized, just return.
if (function->IsOptimized()) return isolate->heap()->undefined_value();
@ -132,7 +132,7 @@ RUNTIME_FUNCTION(Runtime_OptimizeOsr) {
// The following assertion was lifted from the DCHECK inside
// JSFunction::MarkForOptimization().
RUNTIME_ASSERT(function->shared()->allows_lazy_compilation() ||
function->IsOptimizable());
!function->shared()->optimization_disabled());
// If the function is already optimized, just return.
if (function->IsOptimized()) return isolate->heap()->undefined_value();

6
test/cctest/test-compiler.cc
View File

@ -395,10 +395,8 @@ TEST(OptimizedCodeSharing) {
*v8::Local<v8::Function>::Cast(env->Global()->Get(v8_str("closure1"))));
Handle<JSFunction> fun2 = v8::Utils::OpenHandle(
*v8::Local<v8::Function>::Cast(env->Global()->Get(v8_str("closure2"))));
CHECK(fun1->IsOptimized()
|| !CcTest::i_isolate()->use_crankshaft() || !fun1->IsOptimizable());
CHECK(fun2->IsOptimized()
|| !CcTest::i_isolate()->use_crankshaft() || !fun2->IsOptimizable());
CHECK(fun1->IsOptimized() || !CcTest::i_isolate()->use_crankshaft());
CHECK(fun2->IsOptimized() || !CcTest::i_isolate()->use_crankshaft());
CHECK_EQ(fun1->code(), fun2->code());
}
}