From: Rong Xu <xur@google.com>
Date: Tue, 9 Oct 2018 23:10:56 +0000 (+0000)
Subject: [X86] Fix sanitizer bot failure from 344085
X-Git-Tag: llvmorg-8.0.0-rc1~6934
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c7bf1a75652ef73968b3737d44ea4bd2fe49673;p=platform%2Fupstream%2Fllvm.git

[X86] Fix sanitizer bot failure from 344085

Fix the memory issue exposed by sanitizer.

llvm-svn: 344092
---

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 @@ bool X86CondBrFolding::optimize() {
   }
   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();
   }