diff options
| author | Sebastien Hertz <shertz@google.com> | 2015-03-03 12:16:13 +0100 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2015-03-03 14:30:46 +0100 |
| commit | bd9cf9f6bbf285ec7a5b74ce655a9e68e0f6e434 (patch) | |
| tree | 04f3b49c2946c99b0aac23552f8c3cfdf8da39f4 /compiler/driver/compiler_driver.cc | |
| parent | ff9b747588e77f04b07dc76b2d39a82cbfc60441 (diff) | |
| download | android_art-bd9cf9f6bbf285ec7a5b74ce655a9e68e0f6e434.tar.gz android_art-bd9cf9f6bbf285ec7a5b74ce655a9e68e0f6e434.tar.bz2 android_art-bd9cf9f6bbf285ec7a5b74ce655a9e68e0f6e434.zip | |
Follow-up 128393
Avoids false warning when initializing the exception's class by
marking the transaction aborted after throwing the InternalError
exception.
Also uses VLOG(compiler) to print the warning since it's only useful
when investigating ahead-of-time class initialization.
Bug: 19202032
Change-Id: I3c53639cbb888086ad345d668d1e5b73c5aaf861
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 15b3d08a37..8abd7e0507 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1962,8 +1962,7 @@ static void InitializeClass(const ParallelCompilationManager* manager, size_t cl if (!success) { CHECK(soa.Self()->IsExceptionPending()); - ThrowLocation throw_location; - mirror::Throwable* exception = soa.Self()->GetException(&throw_location); + mirror::Throwable* exception = soa.Self()->GetException(nullptr); VLOG(compiler) << "Initialization of " << descriptor << " aborted because of " << exception->Dump(); std::ostream* file_log = manager->GetCompiler()-> |