[llvm] 9708279 - [Attributor][FIX] Undo 16188f9 until SCC iterator bug is fixed

[Johannes Doerfert via llvm-commits]

Author: Johannes Doerfert
Date: 2020-02-21T14:20:42-08:00
New Revision: 9708279c725a515c69c41130aaaa36dc6a0b34d8

URL: https://github.com/llvm/llvm-project/commit/9708279c725a515c69c41130aaaa36dc6a0b34d8
DIFF: https://github.com/llvm/llvm-project/commit/9708279c725a515c69c41130aaaa36dc6a0b34d8.diff

LOG: [Attributor][FIX] Undo 16188f9 until SCC iterator bug is fixed

The buildbot
  http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win
shows some strange SCC iterator bug since 16188f9 which we need to
investigate. This patch should remove the part of 16188f9 that could
have exposed the problem.

Added: 
    

Modified: 
    llvm/lib/Transforms/IPO/Attributor.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/IPO/Attributor.cpp b/llvm/lib/Transforms/IPO/Attributor.cpp
index 13a5191ff802..429123a47a93 100644
--- a/llvm/lib/Transforms/IPO/Attributor.cpp
+++ b/llvm/lib/Transforms/IPO/Attributor.cpp
@@ -4627,9 +4627,7 @@ struct AAValueSimplifyArgument final : AAValueSimplifyImpl {
     Value &V = getAssociatedValue();
     if (V.getType()->isPointerTy() &&
         V.getType()->getPointerElementType()->isFunctionTy() &&
-        !A.isModulePass() &&
-        A.getInfoCache().getAnalysisResultForFunction<LoopAnalysis>(
-            *getAnchorScope()))
+        !A.isModulePass())
       indicatePessimisticFixpoint();
   }
 
@@ -4756,7 +4754,9 @@ struct AAValueSimplifyFloating : AAValueSimplifyImpl {
 
   /// See AbstractAttribute::initialize(...).
   void initialize(Attributor &A) override {
-    AAValueSimplifyImpl::initialize(A);
+    // FIXME: This might have exposed a SCC iterator update bug in the old PM.
+    //        Needs investigation.
+    // AAValueSimplifyImpl::initialize(A);
     Value &V = getAnchorValue();
 
     // TODO: add other stuffs