diff options
| author | Andreas Gampe <agampe@google.com> | 2015-02-23 18:41:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-23 18:41:54 +0000 |
| commit | 96ac49a260223dc00291116daa63d7489c52bb0f (patch) | |
| tree | 1c10beeaf90df2e2039aeb5848f82289bfae6b46 /runtime/runtime.h | |
| parent | 304e47467579c909a6312ef3cca5cdad1433de9c (diff) | |
| parent | 794ad76e8d5b5b9132819d5b08a0570e27615644 (diff) | |
| download | android_art-96ac49a260223dc00291116daa63d7489c52bb0f.tar.gz android_art-96ac49a260223dc00291116daa63d7489c52bb0f.tar.bz2 android_art-96ac49a260223dc00291116daa63d7489c52bb0f.zip | |
Merge "ART: Introduce NO_RETURN, Mark DoLongJump noreturn"
Diffstat (limited to 'runtime/runtime.h')
| -rw-r--r-- | runtime/runtime.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h index e7d95fb595..fb9ca401ac 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -28,6 +28,7 @@ #include "arch/instruction_set.h" #include "base/allocator.h" +#include "base/macros.h" #include "compiler_callbacks.h" #include "gc_root.h" #include "instrumentation.h" @@ -185,7 +186,7 @@ class Runtime { // Aborts semi-cleanly. Used in the implementation of LOG(FATAL), which most // callers should prefer. - [[noreturn]] static void Abort() LOCKS_EXCLUDED(Locks::abort_lock_); + NO_RETURN static void Abort() LOCKS_EXCLUDED(Locks::abort_lock_); // Returns the "main" ThreadGroup, used when attaching user threads. jobject GetMainThreadGroup() const; |