--- a/hotspot/src/share/vm/memory/universe.cpp	Wed Jul 05 11:03:19 2017 -0700
+++ b/hotspot/src/share/vm/memory/universe.cpp	Thu Jul 06 01:50:26 2017 +0200
@@ -874,10 +874,10 @@
       return "Non-zero disjoint base";
     case HeapBasedNarrowOop:
       return "Non-zero based";
+    default:
+      ShouldNotReachHere();
+      return "";
   }
-
-  ShouldNotReachHere();
-  return "";
 }