From dd25aab4f0b0c9e772caba3a1383c57c7c657b47 Mon Sep 17 00:00:00 2001 From: Colin LeMahieu Date: Sat, 30 May 2015 20:03:07 +0000 Subject: [PATCH] [Hexagon] Adding override specifier and removing erroneous assertion git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238664 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp b/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp index 270c3a19dca..ec1309e3c2a 100644 --- a/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp +++ b/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp @@ -39,8 +39,6 @@ public: bool isInstRelaxable(MCInst const &HMI) const { const MCInstrDesc &MCID = HexagonMCInstrInfo::getDesc(*MCII, HMI); - assert(&MCID && "invalid instruction"); - bool Relaxable = false; // Branches and loop-setup insns are handled as necessary by relaxation. if (llvm::HexagonMCInstrInfo::getType(*MCII, HMI) == HexagonII::TypeJ || @@ -58,7 +56,7 @@ public: /// relaxation. /// /// \param Inst - The instruction to test. - bool mayNeedRelaxation(MCInst const &Inst) const { + bool mayNeedRelaxation(MCInst const &Inst) const override { assert(HexagonMCInstrInfo::isBundle(Inst)); bool PreviousIsExtender = false; for (auto const &I : HexagonMCInstrInfo::bundleInstructions(Inst)) { @@ -77,7 +75,7 @@ public: bool fixupNeedsRelaxationAdvanced(const MCFixup &Fixup, bool Resolved, uint64_t Value, const MCRelaxableFragment *DF, - const MCAsmLayout &Layout) const { + const MCAsmLayout &Layout) const override { MCInst const &MCB = DF->getInst(); assert(HexagonMCInstrInfo::isBundle(MCB)); -- 2.34.1