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

[nci] Fix a DCHECK failure related to OSR

Browse Source 
This removes a DCHECK that is no longer valid now that NCI jobs can
also be spawned by OSR requests.

Bug: v8:8888
Change-Id: I84eed41b510cc9c3ab1b35abfda0b6bec88752dd
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2454714
Auto-Submit: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Mythri Alle <mythria@chromium.org>
Reviewed-by: Mythri Alle <mythria@chromium.org>
Cr-Commit-Position: refs/heads/master@{#70373}
This commit is contained in:
Jakob Gruber 2020-10-07 10:23:50 +02:00 committed by Commit Bot
parent 16cd5995f9
commit a19cf8e213
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/codegen/compiler.cc
View File

@ -995,8 +995,9 @@ bool GetOptimizedCodeLater(std::unique_ptr<OptimizedCompilationJob> job,
TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.compile"),
"V8.OptimizeConcurrentPrepare");
if (!PrepareJobWithHandleScope(job.get(), isolate, compilation_info))
if (!PrepareJobWithHandleScope(job.get(), isolate, compilation_info)) {
return false;
}
// The background recompile will own this job.
isolate->optimizing_compile_dispatcher()->QueueForOptimization(job.get());
@ -1011,7 +1012,12 @@ bool GetOptimizedCodeLater(std::unique_ptr<OptimizedCompilationJob> job,
if (CodeKindIsStoredInOptimizedCodeCache(code_kind)) {
function->SetOptimizationMarker(OptimizationMarker::kInOptimizationQueue);
}
DCHECK(function->ActiveTierIsIgnition() || function->ActiveTierIsNCI());
// Note: Usually the active tier is expected to be Ignition or NCI at this
// point (in other words we don't expect to optimize if the function is
// already TF-optimized). There is a special case for OSR though, for which
// we *can* reach this point even if we've already generated non-OSR'd TF
// code.
DCHECK(function->shared().HasBytecodeArray());
return true;
}