From dd6e8b981da23b8ead784eee8b1d866e2972c1fb Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Mon, 4 Mar 2019 08:51:32 +0000 Subject: [PATCH] [AArch64/ARM] Fix two compiler warnings in InstructionSelector, NFCI 1) GCC complains that KnownValid is set but not used. 2) In ARMInstructionSelector::selectGlobal() the code is mixing "enumeral and non-enumeral type in conditional expression". Solve this by casting to unsigned which is the final type anyway. Differential Revision: https://reviews.llvm.org/D58834 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@355304 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AArch64/AArch64InstructionSelector.cpp | 1 + lib/Target/ARM/ARMInstructionSelector.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/Target/AArch64/AArch64InstructionSelector.cpp b/lib/Target/AArch64/AArch64InstructionSelector.cpp index 83d61c82cb0..2a5599f665d 100644 --- a/lib/Target/AArch64/AArch64InstructionSelector.cpp +++ b/lib/Target/AArch64/AArch64InstructionSelector.cpp @@ -503,6 +503,7 @@ static bool selectCopy(MachineInstr &I, const TargetInstrInfo &TII, !TargetRegisterInfo::isPhysicalRegister(I.getOperand(1).getReg()))) && "No phys reg on generic operator!"); assert(KnownValid || isValidCopy(I, DstRegBank, MRI, TRI, RBI)); + (void)KnownValid; return true; }; diff --git a/lib/Target/ARM/ARMInstructionSelector.cpp b/lib/Target/ARM/ARMInstructionSelector.cpp index d69f3265ec1..a9f1f6bbc22 100644 --- a/lib/Target/ARM/ARMInstructionSelector.cpp +++ b/lib/Target/ARM/ARMInstructionSelector.cpp @@ -665,11 +665,12 @@ bool ARMInstructionSelector::selectGlobal(MachineInstrBuilder &MIB, // FIXME: Taking advantage of MOVT for ELF is pretty involved, so we don't // support it yet. See PR28229. - unsigned Opc = UseMovt && !STI.isTargetELF() - ? (UseOpcodeThatLoads ? ARM::MOV_ga_pcrel_ldr - : Opcodes.MOV_ga_pcrel) - : (UseOpcodeThatLoads ? ARM::LDRLIT_ga_pcrel_ldr - : Opcodes.LDRLIT_ga_pcrel); + unsigned Opc = + UseMovt && !STI.isTargetELF() + ? (UseOpcodeThatLoads ? (unsigned)ARM::MOV_ga_pcrel_ldr + : Opcodes.MOV_ga_pcrel) + : (UseOpcodeThatLoads ? (unsigned)ARM::LDRLIT_ga_pcrel_ldr + : Opcodes.LDRLIT_ga_pcrel); MIB->setDesc(TII.get(Opc)); int TargetFlags = ARMII::MO_NO_FLAG; -- 2.40.0