diff src/share/vm/utilities/globalDefinitions.hpp @ 12357:36b1f3224948

Revert changes to globalDefinitions (needs more work) and disable CHECK_UNHANDLED_OOPS in fastdebug until it's fixed upstream
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 17:52:33 +0200
parents 359f7e70ae7f
children 096c224171c4
line wrap: on
line diff
--- a/src/share/vm/utilities/globalDefinitions.hpp	Fri Oct 11 15:41:33 2013 +0200
+++ b/src/share/vm/utilities/globalDefinitions.hpp	Fri Oct 11 17:52:33 2013 +0200
@@ -809,20 +809,20 @@
   CompLevel_full_profile      = 3,         // C1, invocation & backedge counters + mdo
   CompLevel_full_optimization = 4,         // C2 or Shark
 
-#if defined(COMPILER2) || defined(SHARK) || defined(GRAAL)
-  CompLevel_highest_tier      = CompLevel_full_optimization,  // pure C2, tiered or pure Graal
-#elif defined(COMPILER1)
-  CompLevel_highest_tier      = CompLevel_simple,             // pure C1
+#if defined(COMPILER2) || defined(SHARK)
+  CompLevel_highest_tier      = CompLevel_full_optimization,  // pure C2 and tiered
+#elif defined(COMPILER1) || defined(GRAAL)
+  CompLevel_highest_tier      = CompLevel_simple,             // pure C1 or Graal
 #else
   CompLevel_highest_tier      = CompLevel_none,
 #endif
 
 #if defined(TIERED)
   CompLevel_initial_compile   = CompLevel_full_profile        // tiered
-#elif defined(COMPILER1)
-  CompLevel_initial_compile   = CompLevel_simple              // pure C1
-#elif defined(COMPILER2) || defined(SHARK) || defined(GRAAL)
-  CompLevel_initial_compile   = CompLevel_full_optimization   // pure C2 or pure Graal
+#elif defined(COMPILER1) || defined(GRAAL)
+  CompLevel_initial_compile   = CompLevel_simple              // pure C1 or Graal
+#elif defined(COMPILER2) || defined(SHARK)
+  CompLevel_initial_compile   = CompLevel_full_optimization   // pure C2
 #else
   CompLevel_initial_compile   = CompLevel_none
 #endif