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

[wasm] Remove an unneeded lambda

Browse Source 
The lambda used to do more work, now it's just a single function call.
Thus remove the lambda by inlining it into all callers.
Also, get rid of an unneeded parameter on {OnCompilationStopped}.

R=thibaudm@chromium.org

Bug: v8:10933
Change-Id: I2c5bc8dfab7abe47a69c1c3eeb5ec8dd02f503c1
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2440524
Reviewed-by: Thibaud Michaud <thibaudm@chromium.org>
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#70281}
This commit is contained in:
Clemens Backes 2020-09-30 17:55:26 +02:00 committed by Commit Bot
parent a81da1024f
commit e226632acf
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/wasm/module-compiler.cc
View File

@ -631,7 +631,7 @@ class CompilationStateImpl {
int GetFreeCompileTaskId();
int GetUnpublishedUnitsLimits(int task_id);
void OnCompilationStopped(int task_id, const WasmFeatures& detected);
void OnCompilationStopped(const WasmFeatures& detected);
void PublishDetectedFeatures(Isolate*);
// Ensure that a compilation job is running, and increase its concurrency if
// needed.
@ -1274,12 +1274,6 @@ CompilationExecutionResult ExecuteCompilationUnits(
WasmFeatures detected_features = WasmFeatures::None();
auto stop = [&detected_features,
task_id](BackgroundCompileScope& compile_scope) {
compile_scope.compilation_state()->OnCompilationStopped(task_id,
detected_features);
};
// Preparation (synchronized): Initialize the fields above and get the first
// compilation unit.
{
@ -1293,10 +1287,7 @@ CompilationExecutionResult ExecuteCompilationUnits(
unpublished_units_limit =
compilation_state->GetUnpublishedUnitsLimits(task_id);
unit = compilation_state->GetNextCompilationUnit(task_id, baseline_only);
if (!unit) {
stop(compile_scope);
return kNoMoreUnits;
}
if (!unit) return kNoMoreUnits;
}
TRACE_COMPILE("ExecuteCompilationUnits (task id %d)\n", task_id);
@ -1352,20 +1343,20 @@ CompilationExecutionResult ExecuteCompilationUnits(
{
BackgroundCompileScope compile_scope(token);
if (compile_scope.cancelled()) return kNoMoreUnits;
if (!results_to_publish.back().succeeded()) {
// Compile error.
compile_scope.compilation_state()->SetError();
stop(compile_scope);
compilation_failed = true;
compile_scope.compilation_state()->SetError();
break;
}
// Get next unit.
// Yield or get next unit.
if (yield ||
!(unit = compile_scope.compilation_state()->GetNextCompilationUnit(
task_id, baseline_only))) {
publish_results(&compile_scope);
stop(compile_scope);
compile_scope.compilation_state()->OnCompilationStopped(
detected_features);
return yield ? kYield : kNoMoreUnits;
}
@ -3237,9 +3228,7 @@ int CompilationStateImpl::GetUnpublishedUnitsLimits(int task_id) {
return std::max(10, min + (min * task_id / max_compile_concurrency_));
}
void CompilationStateImpl::OnCompilationStopped(int task_id,
const WasmFeatures& detected) {
DCHECK_GE(max_compile_concurrency_, task_id);
void CompilationStateImpl::OnCompilationStopped(const WasmFeatures& detected) {
base::MutexGuard guard(&mutex_);
detected_features_.Add(detected);
}