archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8267806: C1: Relax inlining checks for not yet initialized classes

Browse source 
Reviewed-by: roland, thartmann
This commit is contained in:
Vladimir Ivanov 2021-05-31 08:45:07 +00:00
parent 1e29005a22
commit 35916ed57f
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/hotspot/share/c1/c1_GraphBuilder.cpp
View file

@ -2030,17 +2030,16 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
}
// check if we could do inlining
if (!PatchALot && Inline && target->is_loaded() &&
(klass->is_initialized() || (klass->is_interface() && target->holder()->is_initialized()))
&& !patch_for_appendix) {
if (!PatchALot && Inline && target->is_loaded() && callee_holder->is_linked() && !patch_for_appendix) {
// callee is known => check if we have static binding
if (code == Bytecodes::_invokestatic ||
if ((code == Bytecodes::_invokestatic && callee_holder->is_initialized()) || // invokestatic involves an initialization barrier on resolved klass
code == Bytecodes::_invokespecial ||
(code == Bytecodes::_invokevirtual && target->is_final_method()) ||
code == Bytecodes::_invokedynamic) {
ciMethod* inline_target = (cha_monomorphic_target != NULL) ? cha_monomorphic_target : target;
// static binding => check if callee is ok
bool success = try_inline(inline_target, (cha_monomorphic_target != NULL) || (exact_target != NULL), false, code, better_receiver);
ciMethod* inline_target = (cha_monomorphic_target != NULL) ? cha_monomorphic_target : target;
bool holder_known = (cha_monomorphic_target != NULL) || (exact_target != NULL);
bool success = try_inline(inline_target, holder_known, false /* ignore_return */, code, better_receiver);
CHECK_BAILOUT();
clear_inline_bailout();
@ -3758,7 +3757,9 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known, bool ign
!InlineMethodsWithExceptionHandlers) INLINE_BAILOUT("callee has exception handlers");
if (callee->is_synchronized() &&
!InlineSynchronizedMethods ) INLINE_BAILOUT("callee is synchronized");
if (!callee->holder()->is_initialized()) INLINE_BAILOUT("callee's klass not initialized yet");
if (!callee->holder()->is_linked()) INLINE_BAILOUT("callee's klass not linked yet");
if (bc == Bytecodes::_invokestatic &&
!callee->holder()->is_initialized()) INLINE_BAILOUT("callee's klass not initialized yet");
if (!callee->has_balanced_monitors()) INLINE_BAILOUT("callee's monitors do not match");
// Proper inlining of methods with jsrs requires a little more work.
@ -3840,6 +3841,8 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known, bool ign
print_inlining(callee, "inline", /*success*/ true);
}
assert(bc != Bytecodes::_invokestatic || callee->holder()->is_initialized(), "required");
// NOTE: Bailouts from this point on, which occur at the
// GraphBuilder level, do not cause bailout just of the inlining but
// in fact of the entire compilation.