Mercurial > hg > truffle

changeset 5408:af76b75d5928

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 14 May 2012 16:16:22 +0200
parents 9b44497fef98 (current diff) 80ae8033fe01 (diff)
children fc3efebea409
files
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/bytecodeInfo.cpp	Fri May 11 16:38:22 2012 +0200
+++ b/src/share/vm/opto/bytecodeInfo.cpp	Mon May 14 16:16:22 2012 +0200
@@ -240,6 +240,9 @@
     // ignore heuristic controls on inlining
     return NULL;
   }
+  if (callee_method->should_not_inline()) {
+    return "disallowed by CompilerOracle";
+  }
 
   // Now perform checks which are heuristic
 
@@ -278,10 +281,6 @@
     }
   }
 
-  if (callee_method->should_not_inline()) {
-    return "disallowed by CompilerOracle";
-  }
-
   if (UseStringCache) {
     // Do not inline StringCache::profile() method used only at the beginning.
     if (callee_method->name() == ciSymbol::profile_name() &&