src/share/vm/opto/compile.cpp

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -3402,11 +3402,11 @@
         if (!is_uncommon ) {
           // Is it safe to skip?
           for (uint i = 0; i < in->outcnt(); i++) {
             Node* u = in->raw_out(i);
             if (!u->is_SafePoint() ||
-                 u->is_Call() && u->as_Call()->has_non_debug_use(n)) {
+                (u->is_Call() && u->as_Call()->has_non_debug_use(n))) {
               safe_to_skip = false;
             }
           }
         }
         if (safe_to_skip) {

@@ -3834,13 +3834,12 @@
   case T_DOUBLE:  return (_v._value.j == other._v._value.j);
   case T_OBJECT:
   case T_ADDRESS: return (_v._value.l == other._v._value.l);
   case T_VOID:    return (_v._value.l == other._v._value.l);  // jump-table entries
   case T_METADATA: return (_v._metadata == other._v._metadata);
-  default: ShouldNotReachHere();
+  default: ShouldNotReachHere(); return false;
   }
-  return false;
 }
 
 static int type_to_size_in_bytes(BasicType t) {
   switch (t) {
   case T_INT:     return sizeof(jint   );

@@ -3851,14 +3850,14 @@
     // We use T_VOID as marker for jump-table entries (labels) which
     // need an internal word relocation.
   case T_VOID:
   case T_ADDRESS:
   case T_OBJECT:  return sizeof(jobject);
-  }
-
+  default:
   ShouldNotReachHere();
   return -1;
+  }
 }
 
 int Compile::ConstantTable::qsort_comparator(Constant* a, Constant* b) {
   // sort descending
   if (a->freq() > b->freq())  return -1;