--- a/hotspot/src/share/vm/runtime/java.cpp	Wed Feb 03 01:35:25 2016 +0100
+++ b/hotspot/src/share/vm/runtime/java.cpp	Tue Feb 02 22:12:17 2016 -0500
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -421,7 +421,10 @@
       assert(_before_exit_status == BEFORE_EXIT_DONE, "invalid state");
       return;
     case BEFORE_EXIT_DONE:
-      return;
+      // need block to avoid SS compiler bug
+      {
+        return;
+      }
     }
   }