From e0d384a65629a7f90129a7a14c700ef9e393d213 Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Wed, 8 May 2019 16:27:24 +0000 Subject: [PATCH] [AArch64] Fix scan-build null/uninitialized pointer warnings. NFCI. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@360267 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AArch64/AArch64CompressJumpTables.cpp | 1 + lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Target/AArch64/AArch64CompressJumpTables.cpp b/lib/Target/AArch64/AArch64CompressJumpTables.cpp index bbb25c8086e..48dab79b32d 100644 --- a/lib/Target/AArch64/AArch64CompressJumpTables.cpp +++ b/lib/Target/AArch64/AArch64CompressJumpTables.cpp @@ -107,6 +107,7 @@ bool AArch64CompressJumpTables::compressJumpTable(MachineInstr &MI, MinBlock = Block; } } + assert(MinBlock && "Failed to find minimum offset block"); // The ADR instruction needed to calculate the address of the first reachable // basic block can address +/-1MB. diff --git a/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp index f1aa8a701b0..0a1e925fb84 100644 --- a/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp +++ b/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp @@ -2473,7 +2473,7 @@ OperandMatchResultTy AArch64AsmParser::tryParseAdrpLabel(OperandVector &Operands) { MCAsmParser &Parser = getParser(); SMLoc S = getLoc(); - const MCExpr *Expr; + const MCExpr *Expr = nullptr; if (Parser.getTok().is(AsmToken::Hash)) { Parser.Lex(); // Eat hash token. @@ -2523,7 +2523,7 @@ AArch64AsmParser::tryParseAdrpLabel(OperandVector &Operands) { OperandMatchResultTy AArch64AsmParser::tryParseAdrLabel(OperandVector &Operands) { SMLoc S = getLoc(); - const MCExpr *Expr; + const MCExpr *Expr = nullptr; // Leave anything with a bracket to the default for SVE if (getParser().getTok().is(AsmToken::LBrac)) @@ -2621,7 +2621,7 @@ AArch64AsmParser::tryParseImmWithOptionalShift(OperandVector &Operands) { // Operand should start from # or should be integer, emit error otherwise. return MatchOperand_NoMatch; - const MCExpr *Imm; + const MCExpr *Imm = nullptr; if (parseSymbolicImmVal(Imm)) return MatchOperand_ParseFail; else if (Parser.getTok().isNot(AsmToken::Comma)) { @@ -2660,7 +2660,7 @@ AArch64AsmParser::tryParseImmWithOptionalShift(OperandVector &Operands) { Parser.Lex(); // Eat the number // Just in case the optional lsl #0 is used for immediates other than zero. - if (ShiftAmount == 0 && Imm != 0) { + if (ShiftAmount == 0 && Imm != nullptr) { SMLoc E = Parser.getTok().getLoc(); Operands.push_back(AArch64Operand::CreateImm(Imm, S, E, getContext())); return MatchOperand_Success; -- 2.11.0