diff src/share/vm/interpreter/invocationCounter.cpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents 88672775a26c
children
line wrap: on
line diff
--- a/src/share/vm/interpreter/invocationCounter.cpp	Fri Oct 11 10:38:03 2013 +0200
+++ b/src/share/vm/interpreter/invocationCounter.cpp	Fri Oct 11 15:41:33 2013 +0200
@@ -47,12 +47,7 @@
   // large value.  Now reduce the value, so that the method can be
   // executed many more times before re-entering the VM.
   int old_count = count();
-  int new_count;
-#ifdef GRAALVM
-    new_count = 1;
-#else
-    new_count = MIN2(old_count, (int) (CompileThreshold / 2));
-#endif
+  int new_count = MIN2(old_count, (int) (CompileThreshold / 2));
   // prevent from going to zero, to distinguish from never-executed methods
   if (new_count == 0)  new_count = 1;
   if (old_count != new_count)  set(state(), new_count);