diff src/share/vm/runtime/advancedThresholdPolicy.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents c7db9dc73694 7150b16fda52
children 5119e7f07d93
line wrap: on
line diff
--- a/src/share/vm/runtime/advancedThresholdPolicy.cpp	Thu Oct 16 10:21:29 2014 +0200
+++ b/src/share/vm/runtime/advancedThresholdPolicy.cpp	Wed Oct 15 16:02:50 2014 +0200
@@ -53,7 +53,8 @@
   }
 
   set_c1_count(MAX2(count / 3, 1));
-  set_c2_count(MAX2(count - count / 3, 1));
+  set_c2_count(MAX2(count - c1_count(), 1));
+  FLAG_SET_ERGO(intx, CICompilerCount, c1_count() + c2_count());
 
   // Some inlining tuning
 #ifdef X86