Mercurial > hg > graal-jvmci-8
diff src/share/vm/opto/bytecodeInfo.cpp @ 5950:0f4014d7731b
7152961: InlineTree::should_not_inline may exit prematurely
Reviewed-by: kvn, never
Contributed-by: nils.eliasson@oracle.com
author | never |
---|---|
date | Tue, 13 Mar 2012 10:03:59 -0700 |
parents | f6f3bb0ee072 |
children | 1d7922586cf6 |
line wrap: on
line diff
--- a/src/share/vm/opto/bytecodeInfo.cpp Mon Mar 12 19:54:41 2012 -0700 +++ b/src/share/vm/opto/bytecodeInfo.cpp Tue Mar 13 10:03:59 2012 -0700 @@ -257,6 +257,18 @@ return "exception method"; } + 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() && + callee_method->holder()->name() == ciSymbol::java_lang_StringCache()) { + return "profiling method"; + } + } + // use frequency-based objections only for non-trivial methods if (callee_method->code_size_for_inlining() <= MaxTrivialSize) return NULL; @@ -278,18 +290,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() && - callee_method->holder()->name() == ciSymbol::java_lang_StringCache()) { - return "profiling method"; - } - } - return NULL; }