src/share/vm/code/dependencies.cpp

@@ -270,10 +270,12 @@
     swap = (x->ident() > x2->ident() && x->as_metadata()->as_klass() != ctxk);
     break;
   case exclusive_concrete_methods_2:
     swap = (x->ident() > x2->ident() && x->as_metadata()->as_method()->holder() != ctxk);
     break;
+  default:
+    break;
   }
   if (swap) { ciBaseObject* t = x; x = x2; x2 = t; }
 
   // see if the same (or a similar) dep is already recorded
   if (note_dep_seen(dept, x) && note_dep_seen(dept, x2)) {

@@ -418,11 +420,11 @@
       if (deps->length() <= 1)  continue;
       switch (dep_args(dept)) {
       case 1: deps->sort(sort_dep_value_arg_1, 1); break;
       case 2: deps->sort(sort_dep_value_arg_2, 2); break;
       case 3: deps->sort(sort_dep_value_arg_3, 3); break;
-      default: ShouldNotReachHere();
+      default: ShouldNotReachHere(); break;
       }
     }
     return;
   }
 #endif // INCLUDE_JVMCI

@@ -432,11 +434,11 @@
     if (deps->length() <= 1)  continue;
     switch (dep_args(dept)) {
     case 1: deps->sort(sort_dep_arg_1, 1); break;
     case 2: deps->sort(sort_dep_arg_2, 2); break;
     case 3: deps->sort(sort_dep_arg_3, 3); break;
-    default: ShouldNotReachHere();
+    default: ShouldNotReachHere(); break;
     }
   }
 }
 
 size_t Dependencies::estimate_size_in_bytes() {

@@ -464,12 +466,13 @@
   case abstract_with_exclusive_concrete_subtypes_2:
     return x->as_metadata()->as_klass();
   case unique_concrete_method:
   case exclusive_concrete_methods_2:
     return x->as_metadata()->as_method()->holder();
-  }
+  default:
   return NULL;  // let NULL be NULL
+  }
 }
 
 Klass* Dependencies::ctxk_encoded_as_null(DepType dept, Metadata* x) {
   assert(must_be_in_vm(), "raw oops here");
   switch (dept) {

@@ -478,12 +481,13 @@
     return (Klass*) x;
   case unique_concrete_method:
   case exclusive_concrete_methods_2:
     assert(x->is_method(), "sanity");
     return ((Method*)x)->method_holder();
-  }
+  default:
   return NULL;  // let NULL be NULL
+  }
 }
 
 void Dependencies::encode_content_bytes() {
   sort_all_deps();
 

@@ -1457,11 +1461,11 @@
   //
   // note "true" is conservative answer --
   //     overpass clause is false if k == NULL, implies return true if
   //     answer depends on overpass clause.
   return ! ( m == NULL || m -> is_static() || m -> is_abstract() ||
-             m->is_overpass() && k != NULL && k -> is_abstract() );
+             (m->is_overpass() && k != NULL && k -> is_abstract()) );
 }
 
 
 Klass* Dependencies::find_finalizable_subclass(Klass* k) {
   if (k->is_interface())  return NULL;

@@ -1862,10 +1866,12 @@
         ++nint;
       } else {
         tty->print_cr("  context interface = %s", k->external_name());
       }
       break;
+    default:
+      break;
     }
   }
   if (nsup + nint != 0) {
     tty->print_cr("  context supers = %d, interfaces = %d", nsup, nint);
   }