Mercurial > hg > truffle
diff src/share/vm/graal/graalCompiler.cpp @ 5130:ab038e0d6b43
Merge
| author | Lukas Stadler <lukas.stadler@jku.at> |
|---|---|
| date | Wed, 21 Mar 2012 11:28:22 +0100 |
| parents | 51111665eda6 95b8a32a7cc3 |
| children | fdd9dd4508fa |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompiler.cpp Wed Mar 21 10:47:02 2012 +0100 +++ b/src/share/vm/graal/graalCompiler.cpp Wed Mar 21 11:28:22 2012 +0100 @@ -319,7 +319,7 @@ HotSpotMethodResolved::set_accessFlags(obj, method->access_flags().as_int()); HotSpotMethodResolved::set_maxLocals(obj, method->max_locals()); HotSpotMethodResolved::set_maxStackSize(obj, method->max_stack()); - HotSpotMethodResolved::set_canBeInlined(obj, !CompilerOracle::should_not_inline(method)); + HotSpotMethodResolved::set_canBeInlined(obj, !method->is_not_compilable() && !CompilerOracle::should_not_inline(method)); method->set_graal_mirror(obj()); return obj;