Mercurial > hg > truffle

changeset 14507:fae50ee0308d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author anoll
date Wed, 26 Feb 2014 02:54:49 -0800
parents 47f00f3b3900 (diff) b3fe59626fdc (current diff)
children 78112be27ba0
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlass.cpp	Wed Feb 26 02:38:46 2014 -0800
+++ b/src/share/vm/oops/instanceKlass.cpp	Wed Feb 26 02:54:49 2014 -0800
@@ -2711,7 +2711,7 @@
   Method* m = n->method();
   // Search for match
   while(cur != NULL && cur != n) {
-    if (TieredCompilation) {
+    if (TieredCompilation && m == cur->method()) {
       // Find max level before n
       max_level = MAX2(max_level, cur->comp_level());
     }
@@ -2733,7 +2733,9 @@
     cur = next;
     while (cur != NULL) {
       // Find max level after n
-      max_level = MAX2(max_level, cur->comp_level());
+      if (m == cur->method()) {
+        max_level = MAX2(max_level, cur->comp_level());
+      }
       cur = cur->osr_link();
     }
     m->set_highest_osr_comp_level(max_level);