commit 2c6901120ff9c9dbd3fa7e18c8e487df17741f95
author Gabe Black <gabeblack@google.com> Sat Sep 26 16:33:28 2020 -0700
committer Gabe Black <gabeblack@google.com> Mon Sep 28 05:41:45 2020 +0000
tree 9f0b9b0f6fc24735f4164bb9b8e60549db7b39bd
parent 62aa07c9153dfcf834a13d69b42046724ed56223

base,dev: Use the standard attribute [[noreturn]].

The [[noreturn]] attribute has been standard since c++11, and so we
don't (and haven't for a while) need to wrap it in a macro.

Change-Id: Ifba62c87c19224bb366e93ebba685a063cc750ce
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35218
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/base/compiler.hh

diff --git a/src/base/compiler.hh b/src/base/compiler.hh
index c3b2510..c2eb5d9 100644
--- a/src/base/compiler.hh
+++ b/src/base/compiler.hh
@@ -46,7 +46,6 @@
 // http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
 
 #if defined(__GNUC__) // clang or gcc
-#  define M5_ATTR_NORETURN  __attribute__((noreturn))
 #  define M5_VAR_USED __attribute__((unused))
 #  define M5_ATTR_PACKED __attribute__ ((__packed__))
 #  define M5_NO_INLINE __attribute__ ((__noinline__))

src/base/logging.hh

diff --git a/src/base/logging.hh b/src/base/logging.hh
index f56420b..29a9563 100644
--- a/src/base/logging.hh
+++ b/src/base/logging.hh
@@ -121,7 +121,7 @@
      * functions, and gcc will get mad if a function calls panic and then
      * doesn't return.
      */
-    void exit_helper() M5_ATTR_NORETURN { exit(); ::abort(); }
+    [[noreturn]] void exit_helper() { exit(); ::abort(); }
 
   protected:
     bool enabled;

src/dev/arm/gpu_nomali.hh

diff --git a/src/dev/arm/gpu_nomali.hh b/src/dev/arm/gpu_nomali.hh
index 1880ec6..8c3ac26 100644
--- a/src/dev/arm/gpu_nomali.hh
+++ b/src/dev/arm/gpu_nomali.hh
@@ -99,7 +99,7 @@
      * @param err Error code from the NoMali library.
      * @param msg Message to print.
      */
-    static void gpuPanic(nomali_error_t err, const char *msg) M5_ATTR_NORETURN;
+    [[noreturn]] static void gpuPanic(nomali_error_t err, const char *msg);
     /**
      * Panic if the NoMali returned an error, do nothing otherwise.
      *