summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2013-11-22 00:46:32 +0000
committerLang Hames <lhames@gmail.com>2013-11-22 00:46:32 +0000
commit1ca1123598b0c073cf75e4d89d6eb174722cdf2d (patch)
tree2901ece60c3605d527b403d429c5f32f9b070996
parentb3e721995ff0712d0cecfc1bbce1a0cfc591bccf (diff)
downloadbcm5719-llvm-1ca1123598b0c073cf75e4d89d6eb174722cdf2d.tar.gz
bcm5719-llvm-1ca1123598b0c073cf75e4d89d6eb174722cdf2d.zip
Fix a typo where we were creating <def,kill> operands instead of
<def,dead> ones. Add an assertion to make sure we catch this in the future. Fixes <rdar://problem/15464559>. llvm-svn: 195401
-rw-r--r--llvm/include/llvm/CodeGen/MachineOperand.h2
-rw-r--r--llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/llvm/include/llvm/CodeGen/MachineOperand.h b/llvm/include/llvm/CodeGen/MachineOperand.h
index 57b28fecf86..40f3580bfdb 100644
--- a/llvm/include/llvm/CodeGen/MachineOperand.h
+++ b/llvm/include/llvm/CodeGen/MachineOperand.h
@@ -564,6 +564,8 @@ public:
unsigned SubReg = 0,
bool isDebug = false,
bool isInternalRead = false) {
+ assert(!(isDead && !isDef) && "Dead flag on non-def");
+ assert(!(isKill && isDef) && "Kill flag on def");
MachineOperand Op(MachineOperand::MO_Register);
Op.IsDef = isDef;
Op.IsImp = isImp;
diff --git a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
index b2dd9d85e52..67534c4a445 100644
--- a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
+++ b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
@@ -1934,7 +1934,8 @@ bool llvm::tryFoldSPUpdateIntoPushPop(MachineFunction &MF,
return false;
// Mark the unimportant registers as <def,dead> in the POP.
- RegList.push_back(MachineOperand::CreateReg(CurReg, true, false, true));
+ RegList.push_back(MachineOperand::CreateReg(CurReg, true, false, false,
+ true));
}
if (RegsNeeded > 0)
OpenPOWER on IntegriCloud