diff options
Diffstat (limited to 'lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp')
| -rw-r--r-- | lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp b/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp index 9af8a0b35b2f..ec82e3a41f2a 100644 --- a/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp +++ b/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp @@ -469,13 +469,14 @@ public: else if (isa<LanaiMCExpr>(getImm())) { #ifndef NDEBUG const LanaiMCExpr *SymbolRefExpr = dyn_cast<LanaiMCExpr>(getImm()); - assert(SymbolRefExpr->getKind() == LanaiMCExpr::VK_Lanai_ABS_LO); + assert(SymbolRefExpr && + SymbolRefExpr->getKind() == LanaiMCExpr::VK_Lanai_ABS_LO); #endif Inst.addOperand(MCOperand::createExpr(getImm())); } else if (isa<MCBinaryExpr>(getImm())) { #ifndef NDEBUG const MCBinaryExpr *BinaryExpr = dyn_cast<MCBinaryExpr>(getImm()); - assert(isa<LanaiMCExpr>(BinaryExpr->getLHS()) && + assert(BinaryExpr && isa<LanaiMCExpr>(BinaryExpr->getLHS()) && cast<LanaiMCExpr>(BinaryExpr->getLHS())->getKind() == LanaiMCExpr::VK_Lanai_ABS_LO); #endif @@ -499,13 +500,14 @@ public: else if (isa<LanaiMCExpr>(getImm())) { #ifndef NDEBUG const LanaiMCExpr *SymbolRefExpr = dyn_cast<LanaiMCExpr>(getImm()); - assert(SymbolRefExpr->getKind() == LanaiMCExpr::VK_Lanai_ABS_HI); + assert(SymbolRefExpr && + SymbolRefExpr->getKind() == LanaiMCExpr::VK_Lanai_ABS_HI); #endif Inst.addOperand(MCOperand::createExpr(getImm())); } else if (isa<MCBinaryExpr>(getImm())) { #ifndef NDEBUG const MCBinaryExpr *BinaryExpr = dyn_cast<MCBinaryExpr>(getImm()); - assert(isa<LanaiMCExpr>(BinaryExpr->getLHS()) && + assert(BinaryExpr && isa<LanaiMCExpr>(BinaryExpr->getLHS()) && cast<LanaiMCExpr>(BinaryExpr->getLHS())->getKind() == LanaiMCExpr::VK_Lanai_ABS_HI); #endif @@ -544,10 +546,9 @@ public: } else if (isa<MCBinaryExpr>(getImm())) { #ifndef NDEBUG const MCBinaryExpr *BinaryExpr = dyn_cast<MCBinaryExpr>(getImm()); - const LanaiMCExpr *SymbolRefExpr = - dyn_cast<LanaiMCExpr>(BinaryExpr->getLHS()); - assert(SymbolRefExpr && - SymbolRefExpr->getKind() == LanaiMCExpr::VK_Lanai_None); + assert(BinaryExpr && isa<LanaiMCExpr>(BinaryExpr->getLHS()) && + cast<LanaiMCExpr>(BinaryExpr->getLHS())->getKind() == + LanaiMCExpr::VK_Lanai_None); #endif Inst.addOperand(MCOperand::createExpr(getImm())); } else @@ -580,7 +581,7 @@ public: } static std::unique_ptr<LanaiOperand> CreateToken(StringRef Str, SMLoc Start) { - auto Op = make_unique<LanaiOperand>(TOKEN); + auto Op = std::make_unique<LanaiOperand>(TOKEN); Op->Tok.Data = Str.data(); Op->Tok.Length = Str.size(); Op->StartLoc = Start; @@ -590,7 +591,7 @@ public: static std::unique_ptr<LanaiOperand> createReg(unsigned RegNum, SMLoc Start, SMLoc End) { - auto Op = make_unique<LanaiOperand>(REGISTER); + auto Op = std::make_unique<LanaiOperand>(REGISTER); Op->Reg.RegNum = RegNum; Op->StartLoc = Start; Op->EndLoc = End; @@ -599,7 +600,7 @@ public: static std::unique_ptr<LanaiOperand> createImm(const MCExpr *Value, SMLoc Start, SMLoc End) { - auto Op = make_unique<LanaiOperand>(IMMEDIATE); + auto Op = std::make_unique<LanaiOperand>(IMMEDIATE); Op->Imm.Value = Value; Op->StartLoc = Start; Op->EndLoc = End; |