Skip to content

[mandatory-inline] Extract out tryDevirtualizeCode into its own helper function. NFC. #11839

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

Merged
merged 1 commit into from
Sep 10, 2017
Merged

[mandatory-inline] Extract out tryDevirtualizeCode into its own helper function. NFC. #11839

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions lib/SILOptimizer/Mandatory/MandatoryInlining.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,28 @@ getCalleeFunction(FullApplySite AI, bool &IsThick,
return CalleeFunction;
}

static std::tuple<FullApplySite, SILBasicBlock::iterator>
tryDevirtualizeApplyHelper(FullApplySite InnerAI, SILBasicBlock::iterator I,
ClassHierarchyAnalysis *CHA) {
auto NewInstPair = tryDevirtualizeApply(InnerAI, CHA);
auto *NewInst = NewInstPair.first;
if (!NewInst)
return std::make_tuple(InnerAI, I);

replaceDeadApply(InnerAI, NewInst);
if (auto *II = dyn_cast<SILInstruction>(NewInst))
I = II->getIterator();
else
I = NewInst->getParentBlock()->begin();
auto NewAI = FullApplySite::isa(NewInstPair.second.getInstruction());
// *NOTE*, it is important that we return I here since we may have
// devirtualized but not have a full apply site anymore.
if (!NewAI)
return std::make_tuple(FullApplySite(), I);

return std::make_tuple(NewAI, I);
}

/// \brief Inlines all mandatory inlined functions into the body of a function,
/// first recursively inlining all mandatory apply instructions in those
/// functions into their bodies if necessary.
Expand Down Expand Up @@ -363,19 +385,9 @@ runOnFunctionRecursively(SILFunction *F, FullApplySite AI,

auto *ApplyBlock = InnerAI.getParent();

auto NewInstPair = tryDevirtualizeApply(InnerAI, CHA);
if (auto *NewInst = NewInstPair.first) {
replaceDeadApply(InnerAI, NewInst);
if (auto *II = dyn_cast<SILInstruction>(NewInst))
I = II->getIterator();
else
I = NewInst->getParentBlock()->begin();
auto NewAI = FullApplySite::isa(NewInstPair.second.getInstruction());
if (!NewAI)
continue;

InnerAI = NewAI;
}
std::tie(InnerAI, I) = tryDevirtualizeApplyHelper(InnerAI, I, CHA);
if (!InnerAI)
continue;

SILLocation Loc = InnerAI.getLoc();
SILValue CalleeValue = InnerAI.getCallee();
Expand Down