[llvm] b6cb03e - Revert use of getUniqueUndroppableUser in AssumeBundleBuilder

[Anna Thomas via llvm-commits]

Author: Anna Thomas
Date: 2021-09-15T17:45:09-04:00
New Revision: b6cb03e6b94d91a1757d41d4b0f139166ae15de0

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

LOG: Revert use of getUniqueUndroppableUser in AssumeBundleBuilder

Fix build bot failure in rG4ac4e521 caused due to assumeBundleBuilder
using new API (getUniqueUndroppableUser).
We now continue using the existing API for AssumeBundleBuilder
(getSingleUndroppableUser).

Sorry for the noise here.

Tests-Run: failing testcase passes.

Added: 
    

Modified: 
    llvm/lib/Transforms/Utils/AssumeBundleBuilder.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/Utils/AssumeBundleBuilder.cpp b/llvm/lib/Transforms/Utils/AssumeBundleBuilder.cpp
index 9337794b91d7..259b802bda63 100644
--- a/llvm/lib/Transforms/Utils/AssumeBundleBuilder.cpp
+++ b/llvm/lib/Transforms/Utils/AssumeBundleBuilder.cpp
@@ -161,9 +161,8 @@ struct AssumeBuilderState {
       if (wouldInstructionBeTriviallyDead(Inst)) {
         if (RK.WasOn->use_empty())
           return false;
-        auto *UniqueUser =
-            RK.WasOn->getUniqueUndroppableUser();
-        if (UniqueUser == InstBeingModified)
+        Use *SingleUse = RK.WasOn->getSingleUndroppableUse();
+        if (SingleUse && SingleUse->getUser() == InstBeingModified)
           return false;
       }
     return true;