summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target
diff options
context:
space:
mode:
authorSimon Pilgrim <llvm-dev@redking.me.uk>2017-02-18 22:50:28 +0000
committerSimon Pilgrim <llvm-dev@redking.me.uk>2017-02-18 22:50:28 +0000
commitb092166a76d9e8bfef93a74dda572b5a6fa3a7a6 (patch)
treec2fdee040e37b0bc576f091145d23d37a94f29c8 /llvm/lib/Target
parent7a87eebcad1693d45725e143a53ddc0b162d14d3 (diff)
downloadbcm5719-llvm-b092166a76d9e8bfef93a74dda572b5a6fa3a7a6.tar.gz
bcm5719-llvm-b092166a76d9e8bfef93a74dda572b5a6fa3a7a6.zip
[AArch64] Fix enumeral/non-enumeral conditional expression warning.
gcc only allows you to mix enums / ints if they have the same signedness. llvm-svn: 295577
Diffstat (limited to 'llvm/lib/Target')
-rw-r--r--llvm/lib/Target/AArch64/AArch64MacroFusion.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp b/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp
index 979551696ef..0a0a753bfc8 100644
--- a/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp
+++ b/llvm/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.
OpenPOWER on IntegriCloud