[llvm] r295577 - [AArch64] Fix enumeral/non-enumeral conditional expression warning.

[Simon Pilgrim via llvm-commits]

Author: rksimon
Date: Sat Feb 18 16:50:28 2017
New Revision: 295577

URL: http://llvm.org/viewvc/llvm-project?rev=295577&view=rev
Log:
[AArch64] Fix enumeral/non-enumeral conditional expression warning.

gcc only allows you to mix enums / ints if they have the same signedness.

Modified:
    llvm/trunk/lib/Target/AArch64/AArch64MacroFusion.cpp

Modified: llvm/trunk/lib/Target/AArch64/AArch64MacroFusion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64MacroFusion.cpp?rev=295577&r1=295576&r2=295577&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/AArch64MacroFusion.cpp (original)
+++ llvm/trunk/lib/Target/AArch64/AArch64MacroFusion.cpp Sat Feb 18 16:50:28 2017
@@ -34,10 +34,10 @@ static bool shouldScheduleAdjacent(const
                                    const AArch64Subtarget &ST,
                                    const MachineInstr *First,
                                    const MachineInstr *Second) {
-  unsigned FirstOpcode = First ?
-                         First->getOpcode() : AArch64::INSTRUCTION_LIST_END;
-  unsigned SecondOpcode = Second ?
-                          Second->getOpcode() : AArch64::INSTRUCTION_LIST_END;
+  unsigned FirstOpcode =
+      First ? First->getOpcode() : (unsigned)AArch64::INSTRUCTION_LIST_END;
+  unsigned SecondOpcode =
+      Second ? Second->getOpcode() : (unsigned)AArch64::INSTRUCTION_LIST_END;
 
   if (ST.hasArithmeticBccFusion())
     // Fuse CMN, CMP, TST followed by Bcc.