commit 0c78da51323bc8840aacd9e1bc115f8aff4172a4
author Sander de Smalen <sander.desmalen@arm.com> Mon Sep 03 10:23:34 2018 +0000
committer Sander de Smalen <sander.desmalen@arm.com> Mon Sep 03 10:23:34 2018 +0000
tree 4bbcbe3bca3b50dd3e8c915e0b7eb2caf42e1b3a
parent 83f63e42b2e15e4bc120253b9deae00a232a787d

Fix issue introduced by r341301 that broke buildbot.

A condition in isSpillInstruction() updates a small vector rather
than the 'FI' by-ref parameter, which was used in a subsequent
call to 'isSpillSlotObjectIndex()'. This patch fixes the condition
to check the FIs in the vector instead.

llvm-svn: 341305

llvm/lib/CodeGen/LiveDebugValues.cpp

diff --git a/llvm/lib/CodeGen/LiveDebugValues.cpp b/llvm/lib/CodeGen/LiveDebugValues.cpp
index dbc19b0..00f5872 100644
--- a/llvm/lib/CodeGen/LiveDebugValues.cpp
+++ b/llvm/lib/CodeGen/LiveDebugValues.cpp
@@ -477,9 +477,12 @@
     return false;
 
   // To identify a spill instruction, use the same criteria as in AsmPrinter.
-  if (!((TII->isStoreToStackSlotPostFE(MI, FI) ||
-         TII->hasStoreToStackSlot(MI, Accesses)) &&
-        FrameInfo.isSpillSlotObjectIndex(FI)))
+  if (!((TII->isStoreToStackSlotPostFE(MI, FI) &&
+         FrameInfo.isSpillSlotObjectIndex(FI)) ||
+        (TII->hasStoreToStackSlot(MI, Accesses) &&
+         llvm::any_of(Accesses, [&FrameInfo](TargetInstrInfo::FrameAccess &FA) {
+           return FrameInfo.isSpillSlotObjectIndex(FA.FI);
+         }))))
     return false;
 
   auto isKilledReg = [&](const MachineOperand MO, unsigned &Reg) {