Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop devirtualizing interface calls in preexistence #6773

Merged
merged 1 commit into from Oct 18, 2022
Merged

Stop devirtualizing interface calls in preexistence #6773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 66 additions & 4 deletions compiler/optimizer/LocalOpts.cpp
View file
Open in desktop
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2021 IBM Corp. and others
* Copyright (c) 2000, 2022 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -7288,7 +7288,62 @@ void TR_InvariantArgumentPreexistence::processIndirectCall(TR::Node *node, TR::T

// Quit if class is not compatible with the method
if (resolvedMethod && receiverInfo->getClass() && !classIsCompatibleWithMethod(receiverInfo->getClass(), resolvedMethod))
{
if (trace())
traceMsg(comp(), "PREX: - Receiver type incompatible with method \n");

return;
}

TR::MethodSymbol *methSymbol = node->getSymbol()->getMethodSymbol();
if (methSymbol->isInterface())
{
// Interface type signatures can't be trusted most places in bytecode, so
// only transform interface calls when we have a class bound for the
// receiver.
TR_OpaqueClassBlock *klass = receiverInfo->getClass();
if (klass == NULL || TR::Compiler->cls.isInterfaceClass(comp(), klass))
{
if (trace())
{
traceMsg(
comp(),
"PREX: - No class type bound for interface call receiver\n");
}

return;
}

TR_ResolvedMethod *caller = node->getSymbolReference()->getOwningMethod(comp());
TR::Method *callee = methSymbol->getMethod();
bool aotOk = true;
TR_OpaqueClassBlock *iface = fe()->getClassFromSignature(
callee->classNameChars(), callee->classNameLength(), caller, aotOk);

if (iface == NULL)
{
if (trace())
{
traceMsg(
comp(),
"PREX: - Failed to identify interface for interface call\n");
}

return;
}

if (fe()->isInstanceOf(klass, iface, true, true, true) != TR_yes)
{
if (trace())
{
traceMsg(
comp(),
"PREX: - Insufficient class type bound for interface call receiver\n");
}

return;
}
}

//
// Step 2: Transform
Expand Down Expand Up @@ -7392,7 +7447,6 @@ void TR_InvariantArgumentPreexistence::processIndirectCall(TR::Node *node, TR::T
TR::ClassTableCriticalSection processIndirectCall(comp()->fe());
TR::SymbolReference *symRef = node->getSymbolReference();
TR_PersistentCHTable * chTable = comp()->getPersistentInfo()->getPersistentCHTable();
TR::MethodSymbol *methSymbol = node->getSymbol()->getMethodSymbol();
if (methSymbol->isInterface() || methodSymbol)
{
TR_ResolvedMethod * method = NULL;
Expand All @@ -7411,8 +7465,16 @@ void TR_InvariantArgumentPreexistence::processIndirectCall(TR::Node *node, TR::T
{
if (comp()->getPersistentInfo()->getRuntimeAssumptionTable()->getAssumptionCount(RuntimeAssumptionOnClassExtend) < 100000)
method = chTable->findSingleInterfaceImplementer(receiverInfo->getClass(), node->getSymbolReference()->getCPIndex(), node->getSymbolReference()->getOwningMethod(comp()), comp());
//if (method)
// fprintf(stderr, "%s assumptios=%d\n", comp()->signature(), comp()->getPersistentInfo()->getRuntimeAssumptionTable()->getAssumptionCount(RuntimeAssumptionOnClassExtend));
if (method == NULL)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just an early return I guess, in that nothing could be done with a null method anyway.

{
if (trace())
{
traceMsg(
comp(),
"PREX: - Failed to find interface callee\n");
}
return;
}
}
else
{
Expand Down