commit 5c7bf1a75652ef73968b3737d44ea4bd2fe49673
author Rong Xu <xur@google.com> Tue Oct 09 23:10:56 2018 +0000
committer Rong Xu <xur@google.com> Tue Oct 09 23:10:56 2018 +0000
tree 7fcd99a61e82b0a4136bf62513a68b828958dc33
parent c62dfe512ecd15c074f31965cdb40b59da6a3835

[X86] Fix sanitizer bot failure from 344085

Fix the memory issue exposed by sanitizer.

llvm-svn: 344092

llvm/lib/Target/X86/X86CondBrFolding.cpp

diff --git a/llvm/lib/Target/X86/X86CondBrFolding.cpp b/llvm/lib/Target/X86/X86CondBrFolding.cpp
index 9a5ae70..8b9ef20 100644
--- a/llvm/lib/Target/X86/X86CondBrFolding.cpp
+++ b/llvm/lib/Target/X86/X86CondBrFolding.cpp
@@ -424,8 +424,9 @@
   }
   NumFixedCondBrs += RemoveList.size();
   for (auto MBBI : RemoveList) {
-    for (auto *Succ : MBBI->successors())
-      MBBI->removeSuccessor(Succ);
+    while (!MBBI->succ_empty())
+      MBBI->removeSuccessor(MBBI->succ_end() - 1);
+
     MBBI->eraseFromParent();
   }