diff options
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
-rw-r--r-- | compiler/driver/compiler_driver.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 56333b6d45..d9c0bf3922 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1928,10 +1928,10 @@ void CompilerDriver::Verify(jobject jclass_loader, // Merge all VerifierDeps into the main one. verifier::VerifierDeps* verifier_deps = Thread::Current()->GetVerifierDeps(); for (ThreadPoolWorker* worker : parallel_thread_pool_->GetWorkers()) { - verifier::VerifierDeps* thread_deps = worker->GetThread()->GetVerifierDeps(); - worker->GetThread()->SetVerifierDeps(nullptr); - verifier_deps->MergeWith(*thread_deps, GetCompilerOptions().GetDexFilesForOatFile()); - delete thread_deps; + std::unique_ptr<verifier::VerifierDeps> thread_deps(worker->GetThread()->GetVerifierDeps()); + worker->GetThread()->SetVerifierDeps(nullptr); // We just took ownership. + verifier_deps->MergeWith(std::move(thread_deps), + GetCompilerOptions().GetDexFilesForOatFile()); } Thread::Current()->SetVerifierDeps(nullptr); } |