From: Simon Pilgrim <llvm-dev@redking.me.uk>
Date: Sun, 19 Feb 2017 00:04:30 +0000 (+0000)
Subject: [X86] Fix enumeral/non-enumeral conditional expression warning.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56f5f0cf297ed6f3fc4d09ef6b8b69fbd338ebb4;p=llvm

[X86] 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@295586 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/X86/X86MacroFusion.cpp b/lib/Target/X86/X86MacroFusion.cpp
index 9dbe0ecce26..1b1915ccac1 100644
--- a/lib/Target/X86/X86MacroFusion.cpp
+++ b/lib/Target/X86/X86MacroFusion.cpp
@@ -44,10 +44,10 @@ static bool shouldScheduleAdjacent(const X86Subtarget &ST,
     FuseInc
   } FuseKind;
 
-  unsigned FirstOpcode = First ?
-                         First->getOpcode() : X86::INSTRUCTION_LIST_END;
-  unsigned SecondOpcode = Second ?
-                          Second->getOpcode() : X86::INSTRUCTION_LIST_END;
+  unsigned FirstOpcode =
+      First ? First->getOpcode() : (unsigned)X86::INSTRUCTION_LIST_END;
+  unsigned SecondOpcode =
+      Second ? Second->getOpcode() : (unsigned)X86::INSTRUCTION_LIST_END;
 
   switch (SecondOpcode) {
   default: