Skip to content

Commit eca6550

Browse files
committed
SVM: Always specify the actual inlined method for inlined method relos
...and ignore the call symref. For an inlined indirect call, the inlined method can differ from the method specified by the call symref, which could result in an incorrect inlining table at load time.
1 parent 55ccd8a commit eca6550

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

runtime/compiler/codegen/J9AheadOfTimeCompile.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,8 @@ J9::AheadOfTimeCompile::initializeCommonAOTRelocationHeader(TR::IteratedExternal
530530
uint8_t flags = 0;
531531

532532
TR_ResolvedMethod *resolvedMethod;
533-
if (kind == TR_InlinedInterfaceMethodWithNopGuard ||
533+
if (comp->getOption(TR_UseSymbolValidationManager) ||
534+
kind == TR_InlinedInterfaceMethodWithNopGuard ||
534535
kind == TR_InlinedInterfaceMethod ||
535536
kind == TR_InlinedAbstractMethodWithNopGuard ||
536537
kind == TR_InlinedAbstractMethod)

0 commit comments

Comments
 (0)