diff options
author | Sebastien Hertz <shertz@google.com> | 2015-04-03 07:49:44 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-03 07:49:46 +0000 |
commit | ae36b4a8d05525c977af831f1b31126d84159e4f (patch) | |
tree | 1b474b0bdec9db773cab0a2bca70dce1452f7cd1 /runtime/runtime.cc | |
parent | a68a7cf8f3a6fef22d71a14350176115cb13857f (diff) | |
parent | 2fd7e69505195cda4caaa3161aaf37315552a698 (diff) | |
download | art-ae36b4a8d05525c977af831f1b31126d84159e4f.zip art-ae36b4a8d05525c977af831f1b31126d84159e4f.tar.gz art-ae36b4a8d05525c977af831f1b31126d84159e4f.tar.bz2 |
Merge "Use specific exception class to abort transaction"
Diffstat (limited to 'runtime/runtime.cc')
-rw-r--r-- | runtime/runtime.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 7998f16..42673d1 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -1542,21 +1542,20 @@ bool Runtime::IsTransactionAborted() const { } } -void Runtime::AbortTransactionAndThrowInternalError(Thread* self, - const std::string& abort_message) { +void Runtime::AbortTransactionAndThrowAbortError(Thread* self, const std::string& abort_message) { DCHECK(IsAotCompiler()); DCHECK(IsActiveTransaction()); // Throwing an exception may cause its class initialization. If we mark the transaction // aborted before that, we may warn with a false alarm. Throwing the exception before // marking the transaction aborted avoids that. - preinitialization_transaction_->ThrowInternalError(self, false); + preinitialization_transaction_->ThrowAbortError(self, false); preinitialization_transaction_->Abort(abort_message); } -void Runtime::ThrowInternalErrorForAbortedTransaction(Thread* self) { +void Runtime::ThrowTransactionAbortError(Thread* self) { DCHECK(IsAotCompiler()); DCHECK(IsActiveTransaction()); - preinitialization_transaction_->ThrowInternalError(self, true); + preinitialization_transaction_->ThrowAbortError(self, true); } void Runtime::RecordWriteFieldBoolean(mirror::Object* obj, MemberOffset field_offset, |