From 246f0931ff0851cb16b66c4b8eed2e2d53abe37b Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Fri, 13 Feb 2015 01:30:42 +0000 Subject: [PATCH] AsmWriter/Bitcode: MDLexicalBlockFile git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229017 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Bitcode/LLVMBitCodes.h | 3 ++- lib/AsmParser/LLParser.cpp | 14 ++++++++++++- lib/Bitcode/Reader/BitcodeReader.cpp | 11 ++++++++++ lib/Bitcode/Writer/BitcodeWriter.cpp | 17 +++++++++++---- lib/IR/AsmWriter.cpp | 21 +++++++++++++++---- ...dlexicalblockfile-missing-discriminator.ll | 4 ++++ ...valid-mdlexicalblockfile-missing-parent.ll | 4 ++++ test/Assembler/mdlexicalblock.ll | 13 ++++++++++-- 8 files changed, 75 insertions(+), 12 deletions(-) create mode 100644 test/Assembler/invalid-mdlexicalblockfile-missing-discriminator.ll create mode 100644 test/Assembler/invalid-mdlexicalblockfile-missing-parent.ll diff --git a/include/llvm/Bitcode/LLVMBitCodes.h b/include/llvm/Bitcode/LLVMBitCodes.h index b917c055edf..441f6d629ea 100644 --- a/include/llvm/Bitcode/LLVMBitCodes.h +++ b/include/llvm/Bitcode/LLVMBitCodes.h @@ -157,7 +157,8 @@ namespace bitc { METADATA_SUBROUTINE_TYPE=19, // [distinct, flags, types] METADATA_COMPILE_UNIT = 20, // [distinct, ...] METADATA_SUBPROGRAM = 21, // [distinct, ...] - METADATA_LEXICAL_BLOCK = 22 // [distinct, scope, file, line, column] + METADATA_LEXICAL_BLOCK = 22, // [distinct, scope, file, line, column] + METADATA_LEXICAL_BLOCK_FILE=23// [distinct, scope, file, discriminator] }; // The constants block (CONSTANTS_BLOCK_ID) describes emission for each diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index e579b431d26..90a680818f9 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -3482,9 +3482,21 @@ bool LLParser::ParseMDLexicalBlock(MDNode *&Result, bool IsDistinct) { return false; } +/// ParseMDLexicalBlockFile: +/// ::= !MDLexicalBlockFile(scope: !0, file: !2, discriminator: 9) bool LLParser::ParseMDLexicalBlockFile(MDNode *&Result, bool IsDistinct) { - return TokError("unimplemented parser"); +#define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \ + REQUIRED(scope, MDField, ); \ + OPTIONAL(file, MDField, ); \ + REQUIRED(discriminator, MDUnsignedField, (0, UINT32_MAX)); + PARSE_MD_FIELDS(); +#undef VISIT_MD_FIELDS + + Result = GET_OR_DISTINCT(MDLexicalBlockFile, + (Context, scope.Val, file.Val, discriminator.Val)); + return false; } + bool LLParser::ParseMDNamespace(MDNode *&Result, bool IsDistinct) { return TokError("unimplemented parser"); } diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index 22dcd2a0812..fa139d74fba 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1479,6 +1479,17 @@ std::error_code BitcodeReader::ParseMetadata() { NextMDValueNo++); break; } + case bitc::METADATA_LEXICAL_BLOCK_FILE: { + if (Record.size() != 4) + return Error("Invalid record"); + + MDValueList.AssignValue( + GET_OR_DISTINCT(MDLexicalBlockFile, Record[0], + (Context, getMDOrNull(Record[1]), + getMDOrNull(Record[2]), Record[3])), + NextMDValueNo++); + break; + } case bitc::METADATA_STRING: { std::string String(Record.begin(), Record.end()); llvm::UpgradeMDStringConstant(String); diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index 21dc5349cdc..4643a7236a4 100644 --- a/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -993,11 +993,20 @@ static void WriteMDLexicalBlock(const MDLexicalBlock *N, Record.clear(); } -static void WriteMDLexicalBlockFile(const MDLexicalBlockFile *, - const ValueEnumerator &, BitstreamWriter &, - SmallVectorImpl &, unsigned) { - llvm_unreachable("write not implemented"); +static void WriteMDLexicalBlockFile(const MDLexicalBlockFile *N, + const ValueEnumerator &VE, + BitstreamWriter &Stream, + SmallVectorImpl &Record, + unsigned Abbrev) { + Record.push_back(N->isDistinct()); + Record.push_back(VE.getMetadataOrNullID(N->getScope())); + Record.push_back(VE.getMetadataOrNullID(N->getFile())); + Record.push_back(N->getDiscriminator()); + + Stream.EmitRecord(bitc::METADATA_LEXICAL_BLOCK_FILE, Record, Abbrev); + Record.clear(); } + static void WriteMDNamespace(const MDNamespace *, const ValueEnumerator &, BitstreamWriter &, SmallVectorImpl &, unsigned) { diff --git a/lib/IR/AsmWriter.cpp b/lib/IR/AsmWriter.cpp index 7baa6edc950..560f71f7338 100644 --- a/lib/IR/AsmWriter.cpp +++ b/lib/IR/AsmWriter.cpp @@ -1642,11 +1642,24 @@ static void writeMDLexicalBlock(raw_ostream &Out, const MDLexicalBlock *N, Out << ")"; } -static void writeMDLexicalBlockFile(raw_ostream &, const MDLexicalBlockFile *, - TypePrinting *, SlotTracker *, - const Module *) { - llvm_unreachable("write not implemented"); +static void writeMDLexicalBlockFile(raw_ostream &Out, + const MDLexicalBlockFile *N, + TypePrinting *TypePrinter, + SlotTracker *Machine, + const Module *Context) { + Out << "!MDLexicalBlockFile("; + FieldSeparator FS; + Out << FS << "scope: "; + writeMetadataAsOperand(Out, N->getScope(), TypePrinter, Machine, Context); + if (N->getFile()) { + Out << FS << "file: "; + writeMetadataAsOperand(Out, N->getFile(), TypePrinter, Machine, + Context); + } + Out << FS << "discriminator: " << N->getDiscriminator(); + Out << ")"; } + static void writeMDNamespace(raw_ostream &, const MDNamespace *, TypePrinting *, SlotTracker *, const Module *) { llvm_unreachable("write not implemented"); diff --git a/test/Assembler/invalid-mdlexicalblockfile-missing-discriminator.ll b/test/Assembler/invalid-mdlexicalblockfile-missing-discriminator.ll new file mode 100644 index 00000000000..b71eed82cc4 --- /dev/null +++ b/test/Assembler/invalid-mdlexicalblockfile-missing-discriminator.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+1]]:36: error: missing required field 'discriminator' +!0 = !MDLexicalBlockFile(scope: !{}) diff --git a/test/Assembler/invalid-mdlexicalblockfile-missing-parent.ll b/test/Assembler/invalid-mdlexicalblockfile-missing-parent.ll new file mode 100644 index 00000000000..1c901e25cb5 --- /dev/null +++ b/test/Assembler/invalid-mdlexicalblockfile-missing-parent.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+1]]:42: error: missing required field 'scope' +!0 = !MDLexicalBlockFile(discriminator: 0) diff --git a/test/Assembler/mdlexicalblock.ll b/test/Assembler/mdlexicalblock.ll index f41b8284747..78d77b4d0fe 100644 --- a/test/Assembler/mdlexicalblock.ll +++ b/test/Assembler/mdlexicalblock.ll @@ -1,8 +1,8 @@ ; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s ; RUN: verify-uselistorder %s -; CHECK: !named = !{!0, !1, !2, !3, !4, !4} -!named = !{!0, !1, !2, !3, !4, !5} +; CHECK: !named = !{!0, !1, !2, !3, !4, !4, !5, !6, !7, !7} +!named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9} !0 = distinct !{} !1 = !{!"path/to/file", !"/path/to/dir"} @@ -14,3 +14,12 @@ ; CHECK: !4 = !MDLexicalBlock(scope: !0) !4 = !MDLexicalBlock(scope: !0) !5 = !MDLexicalBlock(scope: !0, file: null, line: 0, column: 0) + +; CHECK: !5 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 0) +; CHECK: !6 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 1) +!6 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 0) +!7 = !MDLexicalBlockFile(scope: !3, file: !2, discriminator: 1) + +; CHECK: !7 = !MDLexicalBlockFile(scope: !3, discriminator: 7) +!8 = !MDLexicalBlockFile(scope: !3, discriminator: 7) +!9 = !MDLexicalBlockFile(scope: !3, file: null, discriminator: 7) -- 2.34.1