[llvm] r354082 - Revert "[INLINER] allow inlining of address taken blocks"

[Nick Desaulniers via llvm-commits]

Author: nickdesaulniers
Date: Thu Feb 14 15:42:21 2019
New Revision: 354082

URL: http://llvm.org/viewvc/llvm-project?rev=354082&view=rev
Log:
Revert "[INLINER] allow inlining of address taken blocks"

This reverts commit 19e95fe61182945b7b68ad15348f144fb996633f.

Modified:
    llvm/trunk/include/llvm/IR/BasicBlock.h
    llvm/trunk/lib/Analysis/InlineCost.cpp
    llvm/trunk/lib/IR/BasicBlock.cpp

Modified: llvm/trunk/include/llvm/IR/BasicBlock.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/BasicBlock.h?rev=354082&r1=354081&r2=354082&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/BasicBlock.h (original)
+++ llvm/trunk/include/llvm/IR/BasicBlock.h Thu Feb 14 15:42:21 2019
@@ -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);

Modified: llvm/trunk/lib/Analysis/InlineCost.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/InlineCost.cpp?rev=354082&r1=354081&r2=354082&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/InlineCost.cpp (original)
+++ llvm/trunk/lib/Analysis/InlineCost.cpp Thu Feb 14 15:42:21 2019
@@ -1832,7 +1832,7 @@ InlineResult CallAnalyzer::analyzeCall(C
     // 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(Functi
     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) {

Modified: llvm/trunk/lib/IR/BasicBlock.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/BasicBlock.cpp?rev=354082&r1=354081&r2=354082&view=diff
==============================================================================
--- llvm/trunk/lib/IR/BasicBlock.cpp (original)
+++ llvm/trunk/lib/IR/BasicBlock.cpp Thu Feb 14 15:42:21 2019
@@ -442,14 +442,6 @@ BasicBlock *BasicBlock::splitBasicBlock(
   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)