From f33094f14272a5ec5eb8d21ff66c3e220e2ba461 Mon Sep 17 00:00:00 2001
From: Juergen Ributzka <juergen@apple.com>
Date: Thu, 4 Sep 2014 02:07:36 +0000
Subject: [PATCH] Revert r216803 "[MachineSinking] Clear kill flag of all
 operands at all their uses."

This reverts commit r216803, because it might have broken the buildbot.
The issue is tracked in PR20842.

llvm-svn: 217120
---
 lib/CodeGen/MachineSink.cpp                   | 16 +++--------
 .../CodeGen/AArch64/fast-isel-machine-sink.ll | 27 -------------------
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 test/CodeGen/AArch64/fast-isel-machine-sink.ll

diff --git a/lib/CodeGen/MachineSink.cpp b/lib/CodeGen/MachineSink.cpp
index edf8fc0645b..77820010cef 100644
--- a/lib/CodeGen/MachineSink.cpp
+++ b/lib/CodeGen/MachineSink.cpp
@@ -724,19 +724,9 @@ bool MachineSinking::SinkInstruction(MachineInstr *MI, bool &SawStore) {
                          ++MachineBasicBlock::iterator(DbgMI));
   }
 
-  // When sinking the instruction the live time of its operands can be extended
-  // bejond their original last use (marked with a kill flag). Conservatively
-  // clear the kill flag in all instructions that use the same operand
-  // registers.
-  for (auto &MO : MI->uses())
-    if (MO.isReg() && MO.isUse()) {
-      // Preserve the kill flag for this instruction.
-      bool IsKill = MO.isKill();
-      // Clear the kill flag in all instruction that use this operand.
-      MRI->clearKillFlags(MO.getReg());
-      // Restore the kill flag for only this instruction.
-      MO.setIsKill(IsKill);
-    }
+  // Conservatively, clear any kill flags, since it's possible that they are no
+  // longer correct.
+  MI->clearKillInfo();
 
   return true;
 }
diff --git a/test/CodeGen/AArch64/fast-isel-machine-sink.ll b/test/CodeGen/AArch64/fast-isel-machine-sink.ll
deleted file mode 100644
index 74d3e8dbad0..00000000000
--- a/test/CodeGen/AArch64/fast-isel-machine-sink.ll
+++ /dev/null
@@ -1,27 +0,0 @@
-; RUN: llc -mtriple=aarch64-apple-darwin -fast-isel -verify-machineinstrs < %s
-
-define void @test() {
-  %sext = shl i64 undef, 32
-  %1 = ashr exact i64 %sext, 32
-  %2 = icmp sgt i64 undef, %1
-  br i1 %2, label %3, label %.critedge1
-
-; <label>:3                                       ; preds = %0
-  %4 = getelementptr inbounds i32* undef, i64 %1
-  %5 = load i32* %4, align 4
-  br i1 undef, label %6, label %.critedge1
-
-; <label>:6                                       ; preds = %3
-  %7 = and i32 %5, 255
-  %8 = icmp eq i32 %7, 255
-  br i1 %8, label %.lr.ph, label %._crit_edge
-
-.lr.ph:                                           ; preds = %.lr.ph, %6
-  br i1 undef, label %.lr.ph, label %.critedge1
-
-._crit_edge:                                      ; preds = %6
-  ret void
-
-.critedge1:                                       ; preds = %.lr.ph, %3, %0
-  ret void
-}