commit c1896c9a0e15df3a1b9a3a19bcd2a933b654fe06
author Elliott Hughes <enh@google.com> Thu Nov 29 11:33:18 2018 -0800
committer Elliott Hughes <enh@google.com> Thu Nov 29 11:33:18 2018 -0800
tree b68a5f5163f8da0da87d671a225addaa2a13095f
parent f2970cd870948a6ee1c8ecd30c9c3147d05aa0be

C++17 compatibility: make WITH_TIDY=1 happy again.

Bug: http://b/111067277
Test: builds
Change-Id: I8b69ea3815e14bb6eb27f40c0dd01a85b340a355

runtime/entrypoints/quick/quick_jni_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_jni_entrypoints.cc b/runtime/entrypoints/quick/quick_jni_entrypoints.cc
index 3c41a8c..5c86bbb 100644
--- a/runtime/entrypoints/quick/quick_jni_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_jni_entrypoints.cc
@@ -252,7 +252,7 @@
         return 0;
       default:
         LOG(FATAL) << "Unexpected return shorty character " << return_shorty_char;
-        return 0;
+        UNREACHABLE();
     }
   }
 }

runtime/entrypoints/quick/quick_trampoline_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index 8737f3f..6deb509 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -297,7 +297,7 @@
       case 4: return (6 * GetBytesPerGprSpillLocation(kRuntimeISA));
       default:
       LOG(FATAL) << "Unexpected GPR index: " << gpr_index;
-      return 0;
+      UNREACHABLE();
     }
   }
 #else