src/share/vm/runtime/java.cpp

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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.

@@ -419,13 +419,16 @@
         BeforeExit_lock->wait();
       }
       assert(_before_exit_status == BEFORE_EXIT_DONE, "invalid state");
       return;
     case BEFORE_EXIT_DONE:
+      // need block to avoid SS compiler bug
+      {
       return;
     }
   }
+  }
 
 #if INCLUDE_JVMCI
   // We are not using CATCH here because we want the exit to continue normally.
   Thread* THREAD = thread;
   JVMCIRuntime::shutdown(THREAD);