diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-10 20:05:39 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-10 20:05:39 -0700 |
| commit | 7223d44a4893522e90d00bca38b119f710e55122 (patch) | |
| tree | c0bbe3f7b3cf04750b4b5359a03c2d63fc90978b /runtime/runtime.h | |
| parent | 3f5b8a1e7dfdf010591e17396d1d126740c5706c (diff) | |
| download | android_art-7223d44a4893522e90d00bca38b119f710e55122.tar.gz android_art-7223d44a4893522e90d00bca38b119f710e55122.tar.bz2 android_art-7223d44a4893522e90d00bca38b119f710e55122.zip | |
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
Diffstat (limited to 'runtime/runtime.h')
| -rw-r--r-- | runtime/runtime.h | 5 |
1 files changed, 1 insertions, 4 deletions
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; |