Merge "Fix 2 new sets of clang compiler warnings."

1 files changed, 1 insertions, 1 deletions

diff --git a/runtime/runtime.h b/runtime/runtime.h
index 1a6c6e0c54..30dabe7af4 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -180,7 +180,7 @@ class Runtime {
   // 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() LOCKS_EXCLUDED(Locks::abort_lock_);
+  static void Abort() NO_RETURN LOCKS_EXCLUDED(Locks::abort_lock_);
 
   // Returns the "main" ThreadGroup, used when attaching user threads.
   jobject GetMainThreadGroup() const;