From: Bruno Cardoso Lopes <bruno.cardoso@gmail.com>
Date: Tue, 10 Oct 2017 16:37:51 +0000 (+0000)
Subject: Revert "[SCCP] Fix mem-sanitizer failure introduced by r315288."
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9831f636a8402e2cfa027dc29fb7fd8813d6c3ee;p=llvm

Revert "[SCCP] Fix mem-sanitizer failure introduced by r315288."

This reverts commit r315294. Part of fixing seg fault introduced in:
http://green.lab.llvm.org/green/job/clang-stage2-configure-Rlto/21675/

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315328 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp
index ca46b9016df..b0f58367c94 100644
--- a/lib/Transforms/Scalar/SCCP.cpp
+++ b/lib/Transforms/Scalar/SCCP.cpp
@@ -1600,10 +1600,8 @@ static bool tryToReplaceWithConstantRange(SCCPSolver &Solver, Value *V) {
   if (!(V->getType()->isIntegerTy() && IV.isConstantRange()))
     return false;
 
-  for (auto UI = V->uses().begin(), E = V->uses().end(); UI != E;) {
-    // Advance the iterator here, as we might remove the current use.
-    const Use &U = *UI++;
-    auto *Icmp = dyn_cast<ICmpInst>(U.getUser());
+  for (auto &Use : V->uses()) {
+    auto *Icmp = dyn_cast<ICmpInst>(Use.getUser());
     if (!Icmp)
       continue;