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 /runtime/class_linker.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 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index ee5eefbc45..af6f7a932c 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -4240,8 +4240,8 @@ bool ClassLinker::InitializeClass(Thread* self, Handle<mirror::Class> klass, } else if (Runtime::Current()->IsTransactionAborted()) { // The exception thrown when the transaction aborted has been caught and cleared // so we need to throw it again now. - LOG(WARNING) << "Return from class initializer of " << PrettyDescriptor(klass.Get()) - << " without exception while transaction was aborted: re-throw it now."; + VLOG(compiler) << "Return from class initializer of " << PrettyDescriptor(klass.Get()) + << " without exception while transaction was aborted: re-throw it now."; Runtime::Current()->ThrowInternalErrorForAbortedTransaction(self); klass->SetStatus(mirror::Class::kStatusError, self); success = false; |