# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1337004982 -7200
# Node ID af76b75d5928549bf7b6134df1bdf12a73b103f5
# Parent  9b44497fef98c3cf1877fa210c515eb99da40614# Parent  80ae8033fe01f9413bea3da64923d167a0b3ff25
Merge

diff -r 9b44497fef98 -r af76b75d5928 src/share/vm/opto/bytecodeInfo.cpp
--- 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() &&