From 1de2acd3c2d94f424d2e8a1b366159c2578754e1 Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Fri, 21 Aug 2015 21:32:39 +0000 Subject: AsmParser: Save and restore the parsing state for types using SlotMapping. This commit extends the 'SlotMapping' structure and includes mappings for named and numbered types in it. The LLParser is extended accordingly to fill out those mappings at the end of module parsing. This information is useful when we want to parse standalone constant values at a later stage using the 'parseConstantValue' method. The constant values can be constant expressions, which can contain references to types. In order to parse such constant values, we have to restore the internal named and numbered mappings for the types in LLParser, otherwise the parser will report a parsing error. Therefore, this commit also introduces a new method called 'restoreParsingState' to LLParser, which uses the slot mappings to restore some of its internal parsing state. This commit is required to serialize constant value pointers in the machine memory operands for the MIR format. Reviewers: Duncan P. N. Exon Smith llvm-svn: 245740 --- llvm/lib/AsmParser/Parser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'llvm/lib/AsmParser/Parser.cpp') diff --git a/llvm/lib/AsmParser/Parser.cpp b/llvm/lib/AsmParser/Parser.cpp index 6135b43f00d..4e55e62ecf5 100644 --- a/llvm/lib/AsmParser/Parser.cpp +++ b/llvm/lib/AsmParser/Parser.cpp @@ -68,13 +68,13 @@ std::unique_ptr llvm::parseAssemblyString(StringRef AsmString, } Constant *llvm::parseConstantValue(StringRef Asm, SMDiagnostic &Err, - const Module &M) { + const Module &M, const SlotMapping *Slots) { SourceMgr SM; std::unique_ptr Buf = MemoryBuffer::getMemBuffer(Asm); SM.AddNewSourceBuffer(std::move(Buf), SMLoc()); Constant *C; if (LLParser(Asm, SM, Err, const_cast(&M)) - .parseStandaloneConstantValue(C)) + .parseStandaloneConstantValue(C, Slots)) return nullptr; return C; } -- cgit v1.2.3