1.1 --- a/src/share/vm/opto/bytecodeInfo.cpp Mon Mar 12 19:54:41 2012 -0700
1.2 +++ b/src/share/vm/opto/bytecodeInfo.cpp Tue Mar 13 10:03:59 2012 -0700
1.3 @@ -257,6 +257,18 @@
1.4 return "exception method";
1.5 }
1.6
1.7 + if (callee_method->should_not_inline()) {
1.8 + return "disallowed by CompilerOracle";
1.9 + }
1.10 +
1.11 + if (UseStringCache) {
1.12 + // Do not inline StringCache::profile() method used only at the beginning.
1.13 + if (callee_method->name() == ciSymbol::profile_name() &&
1.14 + callee_method->holder()->name() == ciSymbol::java_lang_StringCache()) {
1.15 + return "profiling method";
1.16 + }
1.17 + }
1.18 +
1.19 // use frequency-based objections only for non-trivial methods
1.20 if (callee_method->code_size_for_inlining() <= MaxTrivialSize) return NULL;
1.21
1.22 @@ -278,18 +290,6 @@
1.23 }
1.24 }
1.25
1.26 - if (callee_method->should_not_inline()) {
1.27 - return "disallowed by CompilerOracle";
1.28 - }
1.29 -
1.30 - if (UseStringCache) {
1.31 - // Do not inline StringCache::profile() method used only at the beginning.
1.32 - if (callee_method->name() == ciSymbol::profile_name() &&
1.33 - callee_method->holder()->name() == ciSymbol::java_lang_StringCache()) {
1.34 - return "profiling method";
1.35 - }
1.36 - }
1.37 -
1.38 return NULL;
1.39 }
1.40
