summaryrefslogtreecommitdiffstats
path: root/runtime/runtime.h
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-02-23 08:12:24 -0800
committerAndreas Gampe <agampe@google.com>2015-02-23 10:23:06 -0800
commit794ad76e8d5b5b9132819d5b08a0570e27615644 (patch)
tree74b420e4337ecf9e5df689cc376fa965d765a908 /runtime/runtime.h
parentd98ff78976696fdde1e7868d4687719a0439544b (diff)
downloadandroid_art-794ad76e8d5b5b9132819d5b08a0570e27615644.tar.gz
android_art-794ad76e8d5b5b9132819d5b08a0570e27615644.tar.bz2
android_art-794ad76e8d5b5b9132819d5b08a0570e27615644.zip
ART: Introduce NO_RETURN, Mark DoLongJump noreturn
Add NO_RETURN macro that adds C++11 noreturn attribute. Mark DoLongJump methods as noreturn. Change-Id: Ifde4318e370493237050d4c1349285a0382df23f
Diffstat (limited to 'runtime/runtime.h')
-rw-r--r--runtime/runtime.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h
index 118c838397..e6304bd153 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;