From: Simon Pilgrim <llvm-dev@redking.me.uk>
Date: Sat, 18 Feb 2017 22:50:28 +0000 (+0000)
Subject: [AArch64] Fix enumeral/non-enumeral conditional expression warning.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d34dcef8fd29e7bb02cbe8f69ec4e30e896c881;p=llvm

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

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
---

diff --git a/lib/Target/AArch64/AArch64MacroFusion.cpp b/lib/Target/AArch64/AArch64MacroFusion.cpp
index 979551696ef..0a0a753bfc8 100644
--- a/lib/Target/AArch64/AArch64MacroFusion.cpp
+++ b/lib/Target/AArch64/AArch64MacroFusion.cpp
@@ -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.