Author: Fangrui Song Date: 2020-11-29T19:17:59-08:00 New Revision: e6db1416aebf44bdd33a5aab4db1fec58af79590
URL: https://github.com/llvm/llvm-project/commit/e6db1416aebf44bdd33a5aab4db1fec58af79590 DIFF: https://github.com/llvm/llvm-project/commit/e6db1416aebf44bdd33a5aab4db1fec58af79590.diff LOG: [RISCV] Remove unused Addend parameter from classifySymbolRef. NFC It is confusing as well since in the case of A - B + Cst, the returned Addend is not Cst. Added: Modified: llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp Removed: ################################################################################ diff --git a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp index 22ef0829a7ef..cb94d05d9dd4 100644 --- a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp +++ b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp @@ -215,8 +215,7 @@ class RISCVAsmParser : public MCTargetAsmParser { }; static bool classifySymbolRef(const MCExpr *Expr, - RISCVMCExpr::VariantKind &Kind, - int64_t &Addend); + RISCVMCExpr::VariantKind &Kind); RISCVAsmParser(const MCSubtargetInfo &STI, MCAsmParser &Parser, const MCInstrInfo &MII, const MCTargetOptions &Options) @@ -381,7 +380,7 @@ struct RISCVOperand : public MCParsedAsmOperand { bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK); bool IsValid; if (!IsConstantImm) - IsValid = RISCVAsmParser::classifySymbolRef(getImm(), VK, Imm); + IsValid = RISCVAsmParser::classifySymbolRef(getImm(), VK); else IsValid = isShiftedInt<N - 1, 1>(Imm); return IsValid && VK == RISCVMCExpr::VK_RISCV_None; @@ -395,7 +394,7 @@ struct RISCVOperand : public MCParsedAsmOperand { // Must be of 'immediate' type but not a constant. if (!isImm() || evaluateConstantImm(getImm(), Imm, VK)) return false; - return RISCVAsmParser::classifySymbolRef(getImm(), VK, Imm) && + return RISCVAsmParser::classifySymbolRef(getImm(), VK) && VK == RISCVMCExpr::VK_RISCV_None; } @@ -405,7 +404,7 @@ struct RISCVOperand : public MCParsedAsmOperand { // Must be of 'immediate' type but not a constant. if (!isImm() || evaluateConstantImm(getImm(), Imm, VK)) return false; - return RISCVAsmParser::classifySymbolRef(getImm(), VK, Imm) && + return RISCVAsmParser::classifySymbolRef(getImm(), VK) && (VK == RISCVMCExpr::VK_RISCV_CALL || VK == RISCVMCExpr::VK_RISCV_CALL_PLT); } @@ -416,7 +415,7 @@ struct RISCVOperand : public MCParsedAsmOperand { // Must be of 'immediate' type but not a constant. if (!isImm() || evaluateConstantImm(getImm(), Imm, VK)) return false; - return RISCVAsmParser::classifySymbolRef(getImm(), VK, Imm) && + return RISCVAsmParser::classifySymbolRef(getImm(), VK) && VK == RISCVMCExpr::VK_RISCV_CALL; } @@ -426,7 +425,7 @@ struct RISCVOperand : public MCParsedAsmOperand { // Must be of 'immediate' type but not a constant. if (!isImm() || evaluateConstantImm(getImm(), Imm, VK)) return false; - return RISCVAsmParser::classifySymbolRef(getImm(), VK, Imm) && + return RISCVAsmParser::classifySymbolRef(getImm(), VK) && VK == RISCVMCExpr::VK_RISCV_TPREL_ADD; } @@ -641,7 +640,7 @@ struct RISCVOperand : public MCParsedAsmOperand { return false; bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK); if (!IsConstantImm) - IsValid = RISCVAsmParser::classifySymbolRef(getImm(), VK, Imm); + IsValid = RISCVAsmParser::classifySymbolRef(getImm(), VK); else IsValid = isInt<12>(Imm); return IsValid && ((IsConstantImm && VK == RISCVMCExpr::VK_RISCV_None) || @@ -672,7 +671,7 @@ struct RISCVOperand : public MCParsedAsmOperand { return false; bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK); if (!IsConstantImm) { - IsValid = RISCVAsmParser::classifySymbolRef(getImm(), VK, Imm); + IsValid = RISCVAsmParser::classifySymbolRef(getImm(), VK); return IsValid && (VK == RISCVMCExpr::VK_RISCV_HI || VK == RISCVMCExpr::VK_RISCV_TPREL_HI); } else { @@ -690,7 +689,7 @@ struct RISCVOperand : public MCParsedAsmOperand { return false; bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK); if (!IsConstantImm) { - IsValid = RISCVAsmParser::classifySymbolRef(getImm(), VK, Imm); + IsValid = RISCVAsmParser::classifySymbolRef(getImm(), VK); return IsValid && (VK == RISCVMCExpr::VK_RISCV_PCREL_HI || VK == RISCVMCExpr::VK_RISCV_GOT_HI || VK == RISCVMCExpr::VK_RISCV_TLS_GOT_HI || @@ -1849,10 +1848,8 @@ bool RISCVAsmParser::ParseInstruction(ParseInstructionInfo &Info, } bool RISCVAsmParser::classifySymbolRef(const MCExpr *Expr, - RISCVMCExpr::VariantKind &Kind, - int64_t &Addend) { + RISCVMCExpr::VariantKind &Kind) { Kind = RISCVMCExpr::VK_RISCV_None; - Addend = 0; if (const RISCVMCExpr *RE = dyn_cast<RISCVMCExpr>(Expr)) { Kind = RE->getKind(); @@ -1885,10 +1882,6 @@ bool RISCVAsmParser::classifySymbolRef(const MCExpr *Expr, if (!AddendExpr) return false; - Addend = AddendExpr->getValue(); - if (BE->getOpcode() == MCBinaryExpr::Sub) - Addend = -Addend; - // It's some symbol reference + a constant addend return Kind != RISCVMCExpr::VK_RISCV_Invalid; } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits