Mercurial > hg > graal-jvmci-8

diff src/share/vm/runtime/compilationPolicy.cpp @ 10640:88672775a26c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Compilation policy fixes and changed default compilation policy.
author Christian Haeubl <haeubl@ssw.jku.at>
date Mon, 08 Jul 2013 16:55:28 +0200
parents 36bcc10e01c0
children a9b76e1e5ab3
line wrap: on
line diff
--- a/src/share/vm/runtime/compilationPolicy.cpp	Mon Jul 08 12:01:51 2013 +0200
+++ b/src/share/vm/runtime/compilationPolicy.cpp	Mon Jul 08 16:55:28 2013 +0200
@@ -454,11 +454,6 @@
 
   if (is_compilation_enabled() && can_be_compiled(m, comp_level)) {
     nmethod* nm = m->code();
-#ifdef GRAALVM
-    if (m->queued_for_compilation()) {
-      delay_compilation(m());
-    } else
-#endif
     if (nm == NULL ) {
       CompileBroker::compile_method(m, InvocationEntryBci, comp_level, m, hot_count, comment, thread);
     }
@@ -469,6 +464,9 @@
   const int comp_level = CompLevel_highest_tier;
   const int hot_count = m->backedge_count();
   const char* comment = "backedge_count";
+#ifdef GRAALVM
+  reset_counter_for_back_branch_event(m);
+#endif
 
   if (is_compilation_enabled() && !m->is_not_osr_compilable(comp_level) && can_be_compiled(m, comp_level)) {
     CompileBroker::compile_method(m, bci, comp_level, m, hot_count, comment, thread);
@@ -513,7 +511,7 @@
           }
         }
       }
-     
+
       if (!m->queued_for_compilation()) {
         if (TraceCompilationPolicy) {
           tty->print("method invocation trigger: ");
@@ -531,6 +529,7 @@
 void GraalCompPolicy::method_back_branch_event(methodHandle m, int bci, JavaThread* thread) {
   int hot_count = m->backedge_count();
   const char* comment = "backedge_count";
+  reset_counter_for_back_branch_event(m);
 
   if (is_compilation_enabled() && !m->is_not_osr_compilable() && can_be_compiled(m) && !m->queued_for_compilation() && m->code() == NULL) {
     if (TraceCompilationPolicy) {