From 7eaff4c7d6fb83650802efbfbb2492fe5ea752e5 Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Wed, 5 Aug 2015 18:44:00 +0000 Subject: [PATCH] MIR Parser: Extract the IR constant parsing code into a new method. NFC. This commit extracts the code that parses the IR constant values into a new method named 'parseIRConstant' in the 'MIParser' class. The new method will be reused by the code that parses the typed integer immediate machine operands. llvm-svn: 244093 --- llvm/lib/CodeGen/MIRParser/MIParser.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/llvm/lib/CodeGen/MIRParser/MIParser.cpp b/llvm/lib/CodeGen/MIRParser/MIParser.cpp index 0663b119e284..5bedd3e18f3c 100644 --- a/llvm/lib/CodeGen/MIRParser/MIParser.cpp +++ b/llvm/lib/CodeGen/MIRParser/MIParser.cpp @@ -99,6 +99,7 @@ public: bool parseSubRegisterIndex(unsigned &SubReg); bool parseRegisterOperand(MachineOperand &Dest, bool IsDef = false); bool parseImmediateOperand(MachineOperand &Dest); + bool parseIRConstant(StringRef::iterator Loc, const Constant *&C); bool parseFPImmediateOperand(MachineOperand &Dest); bool parseMBBReference(MachineBasicBlock *&MBB); bool parseMBBOperand(MachineOperand &Dest); @@ -557,18 +558,24 @@ bool MIParser::parseImmediateOperand(MachineOperand &Dest) { return false; } +bool MIParser::parseIRConstant(StringRef::iterator Loc, const Constant *&C) { + auto Source = StringRef(Loc, Token.stringValue().end() - Loc).str(); + lex(); + SMDiagnostic Err; + C = parseConstantValue(Source.c_str(), Err, *MF.getFunction()->getParent()); + if (!C) + return error(Loc + Err.getColumnNo(), Err.getMessage()); + return false; +} + bool MIParser::parseFPImmediateOperand(MachineOperand &Dest) { auto Loc = Token.location(); lex(); if (Token.isNot(MIToken::FloatingPointLiteral)) return error("expected a floating point literal"); - auto Source = StringRef(Loc, Token.stringValue().end() - Loc).str(); - lex(); - SMDiagnostic Err; - const Constant *C = - parseConstantValue(Source.c_str(), Err, *MF.getFunction()->getParent()); - if (!C) - return error(Loc + Err.getColumnNo(), Err.getMessage()); + const Constant *C = nullptr; + if (parseIRConstant(Loc, C)) + return true; Dest = MachineOperand::CreateFPImm(cast(C)); return false; }