From 7223d44a4893522e90d00bca38b119f710e55122 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Fri, 10 Oct 2014 20:05:39 -0700 Subject: Switch to C++11 style [[noreturn]]. Also remove old comment about calls to Abort getting merged. We have few LOG(FATAL)s so merging is less of an issue. Also, recompiling with O0 and similar will avoid the optimization and we expect that for GDB debugging. Change-Id: I840dc6f4b8511294be0e117c634ec15b745e7be5 --- runtime/runtime.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'runtime/runtime.h') diff --git a/runtime/runtime.h b/runtime/runtime.h index 30dabe7af4..7bffc335ef 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -177,10 +177,7 @@ class Runtime { // Aborts semi-cleanly. Used in the implementation of LOG(FATAL), which most // callers should prefer. - // This isn't marked ((noreturn)) because then gcc will merge multiple calls - // in a single function together. This reduces code size slightly, but means - // that the native stack trace we get may point at the wrong call site. - static void Abort() NO_RETURN LOCKS_EXCLUDED(Locks::abort_lock_); + [[noreturn]] static void Abort() LOCKS_EXCLUDED(Locks::abort_lock_); // Returns the "main" ThreadGroup, used when attaching user threads. jobject GetMainThreadGroup() const; -- cgit v1.2.3