projects
/
oota-llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a27231
)
Silencing an "enumeral and non-enumeral type in conditional expression" warning....
author
Aaron Ballman
<aaron@aaronballman.com>
Wed, 24 Sep 2014 13:54:56 +0000
(13:54 +0000)
committer
Aaron Ballman
<aaron@aaronballman.com>
Wed, 24 Sep 2014 13:54:56 +0000
(13:54 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218381
91177308
-0d34-0410-b5e6-
96231b3b80d8
lib/Target/R600/SIInstrInfo.cpp
patch
|
blob
|
history
diff --git
a/lib/Target/R600/SIInstrInfo.cpp
b/lib/Target/R600/SIInstrInfo.cpp
index 41e6d37e01430cfdc98bcd8c1a8185ce68cfc0cc..fffd698d14f6678764836d335748ea23c461feaf 100644
(file)
--- a/
lib/Target/R600/SIInstrInfo.cpp
+++ b/
lib/Target/R600/SIInstrInfo.cpp
@@
-1281,7
+1281,8
@@
bool SIInstrInfo::isOperandLegal(const MachineInstr *MI, unsigned OpIdx,
MO = &MI->getOperand(OpIdx);
if (usesConstantBus(MRI, *MO)) {
- unsigned SGPRUsed = MO->isReg() ? MO->getReg() : AMDGPU::NoRegister;
+ unsigned SGPRUsed =
+ MO->isReg() ? MO->getReg() : (unsigned)AMDGPU::NoRegister;
for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
if (i == OpIdx)
continue;