-Werror=return-type

Change-Id: I44e627fa9de9c48a534cbc9ade6cc9d567553709

1 files changed, 6 insertions, 3 deletions

diff --git a/compilerplugins/clang/nullptr.cxx b/compilerplugins/clang/nullptr.cxx
index 8c1426919c30..800343963b60 100644
--- a/compilerplugins/clang/nullptr.cxx
+++ b/compilerplugins/clang/nullptr.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <cassert>
+#include <cstdlib>
 #include <set>
 
 #include "compat.hxx"
@@ -17,9 +18,6 @@ namespace {
 
 char const * kindName(Expr::NullPointerConstantKind kind) {
     switch (kind) {
-    case Expr::NPCK_NotNull:
-        assert(false); // cannot happen
-        // fall through
     case Expr::NPCK_ZeroExpression:
         return "ZeroExpression";
     case Expr::NPCK_ZeroLiteral:
@@ -28,6 +26,11 @@ char const * kindName(Expr::NullPointerConstantKind kind) {
         return "CXX11_nullptr";
     case Expr::NPCK_GNUNull:
         return "GNUNull";
+    case Expr::NPCK_NotNull:
+        assert(false); // cannot happen
+        // fall through
+    default:
+        std::abort();
     }
 }