[llvm] r218381 - Silencing an "enumeral and non-enumeral type in conditional expression" warning. NFC.

[Aaron Ballman]

Author: aaronballman
Date: Wed Sep 24 08:54:56 2014
New Revision: 218381

URL: http://llvm.org/viewvc/llvm-project?rev=218381&view=rev
Log:
Silencing an "enumeral and non-enumeral type in conditional expression" warning. NFC.

Modified:
    llvm/trunk/lib/Target/R600/SIInstrInfo.cpp

Modified: llvm/trunk/lib/Target/R600/SIInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/SIInstrInfo.cpp?rev=218381&r1=218380&r2=218381&view=diff
==============================================================================
--- llvm/trunk/lib/Target/R600/SIInstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/R600/SIInstrInfo.cpp Wed Sep 24 08:54:56 2014
@@ -1281,7 +1281,8 @@ bool SIInstrInfo::isOperandLegal(const M
     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;