summaryrefslogtreecommitdiffstats
path: root/dex2oat
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 /dex2oat
parentd98ff78976696fdde1e7868d4687719a0439544b (diff)
downloadart-794ad76e8d5b5b9132819d5b08a0570e27615644.zip
art-794ad76e8d5b5b9132819d5b08a0570e27615644.tar.gz
art-794ad76e8d5b5b9132819d5b08a0570e27615644.tar.bz2
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 'dex2oat')
-rw-r--r--dex2oat/dex2oat.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index e607e15..0b1f14d 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -36,6 +36,7 @@
#include "arch/instruction_set_features.h"
#include "arch/mips/instruction_set_features_mips.h"
#include "base/dumpable.h"
+#include "base/macros.h"
#include "base/stl_util.h"
#include "base/stringpiece.h"
#include "base/timing_logger.h"
@@ -97,7 +98,7 @@ static void UsageError(const char* fmt, ...) {
va_end(ap);
}
-[[noreturn]] static void Usage(const char* fmt, ...) {
+NO_RETURN static void Usage(const char* fmt, ...) {
va_list ap;
va_start(ap, fmt);
UsageErrorV(fmt, ap);
@@ -326,7 +327,7 @@ class WatchDog {
message.c_str());
}
- [[noreturn]] static void Fatal(const std::string& message) {
+ NO_RETURN static void Fatal(const std::string& message) {
Message('F', message);
exit(1);
}