diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-07-16 20:32:27 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-07-22 15:13:56 -0700 |
| commit | 90443477f9a0061581c420775ce3b7eeae7468bc (patch) | |
| tree | 8c74b81dfae162e0fd0ccf8d5ac50827ba815174 /runtime/quick_exception_handler.h | |
| parent | 6078aec213dfaf111c29969706e8e5967cfc9bea (diff) | |
Move to newer clang annotations
Also enable -Wthread-safety-negative.
Changes:
Switch to capabilities and negative capabilities.
Future work:
Use capabilities to implement uninterruptible annotations to work
with AssertNoThreadSuspension.
Bug: 20072211
Change-Id: I42fcbe0300d98a831c89d1eff3ecd5a7e99ebf33
Diffstat (limited to 'runtime/quick_exception_handler.h')
| -rw-r--r-- | runtime/quick_exception_handler.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/quick_exception_handler.h b/runtime/quick_exception_handler.h index 8d7cd12216..ce9085d70a 100644 --- a/runtime/quick_exception_handler.h +++ b/runtime/quick_exception_handler.h @@ -36,17 +36,17 @@ class ShadowFrame; class QuickExceptionHandler { public: QuickExceptionHandler(Thread* self, bool is_deoptimization) - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + SHARED_REQUIRES(Locks::mutator_lock_); NO_RETURN ~QuickExceptionHandler() { LOG(FATAL) << "UNREACHABLE"; // Expected to take long jump. UNREACHABLE(); } - void FindCatch(mirror::Throwable* exception) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - void DeoptimizeStack() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - void UpdateInstrumentationStack() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - NO_RETURN void DoLongJump() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + void FindCatch(mirror::Throwable* exception) SHARED_REQUIRES(Locks::mutator_lock_); + void DeoptimizeStack() SHARED_REQUIRES(Locks::mutator_lock_); + void UpdateInstrumentationStack() SHARED_REQUIRES(Locks::mutator_lock_); + NO_RETURN void DoLongJump() SHARED_REQUIRES(Locks::mutator_lock_); void SetHandlerQuickFrame(ArtMethod** handler_quick_frame) { handler_quick_frame_ = handler_quick_frame; |