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

[wasm] Remove redundant CompilationStateImpl::Abort

Browse Source 
Merge {Abort} into {AbortCompilation}.

R=ahaas@chromium.org

Bug: v8:8689
Change-Id: I091a298b1195d145fc21d2afb9d9cc9c57925f95
Reviewed-on: https://chromium-review.googlesource.com/c/1451821
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Reviewed-by: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#59346}
This commit is contained in:
Clemens Hammacher 2019-02-04 15:49:46 +01:00 committed by Commit Bot
parent 81a62c8cb6
commit d8ca31ab78
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,8 +149,6 @@ class CompilationStateImpl {
void RestartBackgroundCompileTask();
void RestartBackgroundTasks();
void Abort();
void SetError(uint32_t func_index, const WasmError& error);
Isolate* isolate() const { return isolate_; }
@ -856,7 +854,7 @@ AsyncCompileJob::~AsyncCompileJob() {
// If the runtime objects were not created yet, then initial compilation did
// not finish yet. In this case we can abort compilation.
if (native_module_ && module_object_.is_null()) {
Impl(native_module_->compilation_state())->Abort();
Impl(native_module_->compilation_state())->AbortCompilation();
}
// Tell the streaming decoder that the AsyncCompileJob is not available
// anymore.
@ -1287,7 +1285,7 @@ void AsyncStreamingProcessor::FinishAsyncCompileJobWithError(
// Check if there is already a CompiledModule, in which case we have to clean
// up the CompilationStateImpl as well.
if (job_->native_module_) {
Impl(job_->native_module_->compilation_state())->Abort();
Impl(job_->native_module_->compilation_state())->AbortCompilation();
job_->DoSync<AsyncCompileJob::DecodeFail,
AsyncCompileJob::kUseExistingForegroundTask>(error);
@ -1489,7 +1487,9 @@ CompilationStateImpl::~CompilationStateImpl() {
}
void CompilationStateImpl::AbortCompilation() {
Abort();
background_compile_token_->Cancel();
// No more callbacks after abort.
callbacks_.clear();
}
void CompilationStateImpl::SetNumberOfFunctionsToCompile(size_t num_functions) {
@ -1650,12 +1650,6 @@ void CompilationStateImpl::RestartBackgroundTasks() {
}
}
void CompilationStateImpl::Abort() {
background_compile_token_->Cancel();
// No more callbacks after abort.
callbacks_.clear();
}
void CompilationStateImpl::SetError(uint32_t func_index,
const WasmError& error) {
DCHECK(error.has_error());