]> granicus.if.org Git - llvm/commitdiff
[AArch64] Fix enumeral/non-enumeral conditional expression warning.
authorSimon Pilgrim <llvm-dev@redking.me.uk>
Sat, 18 Feb 2017 22:50:28 +0000 (22:50 +0000)
committerSimon Pilgrim <llvm-dev@redking.me.uk>
Sat, 18 Feb 2017 22:50:28 +0000 (22:50 +0000)
gcc only allows you to mix enums / ints if they have the same signedness.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@295577 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/AArch64/AArch64MacroFusion.cpp

index 979551696ef90876a12e5bf7459e04fe087b96cf..0a0a753bfc868763834faec82804ed055089de8a 100644 (file)
@@ -34,10 +34,10 @@ static bool shouldScheduleAdjacent(const AArch64InstrInfo &TII,
                                    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.