Commit c23f9239 authored by Victor Gomes's avatar Victor Gomes Committed by V8 LUCI CQ

[baseline] Fix CanCompileCSP

Fixes wrong conditional logic in BaselineCompilerTask::Install.
Removes is_compiled(), since CanCompileWithBaseline already
checks for HasBytecodeArray.

Bug: chromium:1307072
Change-Id: I4cc61e2bab8d1fb5a5b253d291c7079b82c3fa44
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3532230
Commit-Queue: Victor Gomes <victorgomes@chromium.org>
Auto-Submit: Victor Gomes <victorgomes@chromium.org>
Reviewed-by: 's avatarToon Verwaest <verwaest@chromium.org>
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Cr-Commit-Position: refs/heads/main@{#79513}
parent 0f1fbfbe
...@@ -29,8 +29,7 @@ namespace baseline { ...@@ -29,8 +29,7 @@ namespace baseline {
static bool CanCompileWithConcurrentBaseline(SharedFunctionInfo shared, static bool CanCompileWithConcurrentBaseline(SharedFunctionInfo shared,
Isolate* isolate) { Isolate* isolate) {
return !shared.is_compiled() || shared.HasBaselineCode() || return !shared.HasBaselineCode() && CanCompileWithBaseline(isolate, shared);
!CanCompileWithBaseline(isolate, shared);
} }
class BaselineCompilerTask { class BaselineCompilerTask {
...@@ -106,7 +105,7 @@ class BaselineBatchCompilerJob { ...@@ -106,7 +105,7 @@ class BaselineBatchCompilerJob {
if (!maybe_sfi.GetHeapObjectIfWeak(&obj)) continue; if (!maybe_sfi.GetHeapObjectIfWeak(&obj)) continue;
// Skip functions where the bytecode has been flushed. // Skip functions where the bytecode has been flushed.
SharedFunctionInfo shared = SharedFunctionInfo::cast(obj); SharedFunctionInfo shared = SharedFunctionInfo::cast(obj);
if (CanCompileWithConcurrentBaseline(shared, isolate)) continue; if (!CanCompileWithConcurrentBaseline(shared, isolate)) continue;
tasks_.emplace_back(isolate, handles_.get(), shared); tasks_.emplace_back(isolate, handles_.get(), shared);
} }
if (FLAG_trace_baseline_concurrent_compilation) { if (FLAG_trace_baseline_concurrent_compilation) {
......
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