RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[INLINER] allow inlining of address taken blocks"

Browse Source 
This reverts commit 19e95fe61182945b7b68ad15348f144fb996633f.

llvm-svn: 354082
This commit is contained in:
Nick Desaulniers 2019-02-14 23:42:21 +00:00
parent 995c559f1d
commit 08f5596af4
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/IR/BasicBlock.h
View File

@ -390,11 +390,6 @@ public:
/// direct branches, switches, etc. to it.
bool hasAddressTaken() const { return getSubclassDataFromValue() != 0; }
/// Returns true if there are any uses of the address of this basic block
/// that are call instructions (which may allow the address of this basic
/// block to escape).
bool addressPotentiallyEscapesFunction();
/// Update all phi nodes in this basic block's successors to refer to basic
/// block \p New instead of to it.
void replaceSuccessorsPhiUsesWith(BasicBlock *New);

4
lib/Analysis/InlineCost.cpp
View File

@ -1832,7 +1832,7 @@ InlineResult CallAnalyzer::analyzeCall(CallSite CS) {
// see an indirect branch that ends up being dead code at a particular call
// site. If the blockaddress escapes the function, e.g., via a global
// variable, inlining may lead to an invalid cross-function reference.
if (BB->hasAddressTaken() && BB->addressPotentiallyEscapesFunction())
if (BB->hasAddressTaken())
return "blockaddress";
// Analyze the cost of this block. If we blow through the threshold, this
@ -2082,7 +2082,7 @@ InlineResult llvm::isInlineViable(Function &F) {
if (isa<IndirectBrInst>(BI->getTerminator()))
return "contains indirect branches";
if (BI->hasAddressTaken() && BI->addressPotentiallyEscapesFunction())
if (BI->hasAddressTaken())
return "uses block address";
for (auto &II : *BI) {

8
lib/IR/BasicBlock.cpp
View File

@ -442,14 +442,6 @@ BasicBlock *BasicBlock::splitBasicBlock(iterator I, const Twine &BBName) {
return New;
}
bool BasicBlock::addressPotentiallyEscapesFunction() {
for (const Use& U : BlockAddress::get(this)->uses())
if (const CallInst* CI = dyn_cast<CallInst>(U))
if (!CI->paramHasAttr(U.getOperandNo(), Attribute::NoCapture))
return true;
return false;
}
void BasicBlock::replaceSuccessorsPhiUsesWith(BasicBlock *New) {
Instruction *TI = getTerminator();
if (!TI)