From e146000565c86e7cd70d746a64084f1ea3a7528e Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Fri, 13 Feb 2015 01:32:09 +0000 Subject: [PATCH] AsmWriter/Bitcode: MDNamespace llvm-svn: 229018 --- llvm/include/llvm/Bitcode/LLVMBitCodes.h | 3 ++- llvm/include/llvm/IR/DebugInfoMetadata.h | 2 ++ llvm/lib/AsmParser/LLParser.cpp | 15 ++++++++++++++- llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 12 ++++++++++++ llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | 17 +++++++++++++---- llvm/lib/IR/AsmWriter.cpp | 20 +++++++++++++++++--- .../invalid-mdnamespace-missing-namespace.ll | 4 ++++ llvm/test/Assembler/mdnamespace.ll | 16 ++++++++++++++++ 8 files changed, 80 insertions(+), 9 deletions(-) create mode 100644 llvm/test/Assembler/invalid-mdnamespace-missing-namespace.ll create mode 100644 llvm/test/Assembler/mdnamespace.ll diff --git a/llvm/include/llvm/Bitcode/LLVMBitCodes.h b/llvm/include/llvm/Bitcode/LLVMBitCodes.h index 441f6d6..08feb82 100644 --- a/llvm/include/llvm/Bitcode/LLVMBitCodes.h +++ b/llvm/include/llvm/Bitcode/LLVMBitCodes.h @@ -158,7 +158,8 @@ namespace bitc { METADATA_COMPILE_UNIT = 20, // [distinct, ...] METADATA_SUBPROGRAM = 21, // [distinct, ...] METADATA_LEXICAL_BLOCK = 22, // [distinct, scope, file, line, column] - METADATA_LEXICAL_BLOCK_FILE=23// [distinct, scope, file, discriminator] + METADATA_LEXICAL_BLOCK_FILE=23,//[distinct, scope, file, discriminator] + METADATA_NAMESPACE = 24 // [distinct, scope, file, name, line] }; // The constants block (CONSTANTS_BLOCK_ID) describes emission for each diff --git a/llvm/include/llvm/IR/DebugInfoMetadata.h b/llvm/include/llvm/IR/DebugInfoMetadata.h index 64af1a8..72d5c43 100644 --- a/llvm/include/llvm/IR/DebugInfoMetadata.h +++ b/llvm/include/llvm/IR/DebugInfoMetadata.h @@ -1104,6 +1104,8 @@ public: Metadata *getScope() const { return getOperand(1); } StringRef getName() const { return getStringOperand(2); } + MDString *getRawName() const { return getOperandAs(2); } + static bool classof(const Metadata *MD) { return MD->getMetadataID() == MDNamespaceKind; } diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp index 90a6808..be1db22 100644 --- a/llvm/lib/AsmParser/LLParser.cpp +++ b/llvm/lib/AsmParser/LLParser.cpp @@ -3497,9 +3497,22 @@ bool LLParser::ParseMDLexicalBlockFile(MDNode *&Result, bool IsDistinct) { return false; } +/// ParseMDNamespace: +/// ::= !MDNamespace(scope: !0, file: !2, name: "SomeNamespace", line: 9) bool LLParser::ParseMDNamespace(MDNode *&Result, bool IsDistinct) { - return TokError("unimplemented parser"); +#define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \ + REQUIRED(scope, MDField, ); \ + OPTIONAL(file, MDField, ); \ + OPTIONAL(name, MDStringField, ); \ + OPTIONAL(line, LineField, ); + PARSE_MD_FIELDS(); +#undef VISIT_MD_FIELDS + + Result = GET_OR_DISTINCT(MDNamespace, + (Context, scope.Val, file.Val, name.Val, line.Val)); + return false; } + bool LLParser::ParseMDTemplateTypeParameter(MDNode *&Result, bool IsDistinct) { return TokError("unimplemented parser"); } diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index fa139d7..d060678 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1490,6 +1490,18 @@ std::error_code BitcodeReader::ParseMetadata() { NextMDValueNo++); break; } + case bitc::METADATA_NAMESPACE: { + if (Record.size() != 5) + return Error("Invalid record"); + + MDValueList.AssignValue( + GET_OR_DISTINCT(MDNamespace, Record[0], + (Context, getMDOrNull(Record[1]), + getMDOrNull(Record[2]), getMDString(Record[3]), + Record[4])), + NextMDValueNo++); + break; + } case bitc::METADATA_STRING: { std::string String(Record.begin(), Record.end()); llvm::UpgradeMDStringConstant(String); diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp index 4643a72..aa774ba 100644 --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -1007,11 +1007,20 @@ static void WriteMDLexicalBlockFile(const MDLexicalBlockFile *N, Record.clear(); } -static void WriteMDNamespace(const MDNamespace *, const ValueEnumerator &, - BitstreamWriter &, SmallVectorImpl &, - unsigned) { - llvm_unreachable("write not implemented"); +static void WriteMDNamespace(const MDNamespace *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(VE.getMetadataOrNullID(N->getRawName())); + Record.push_back(N->getLine()); + + Stream.EmitRecord(bitc::METADATA_NAMESPACE, Record, Abbrev); + Record.clear(); } + static void WriteMDTemplateTypeParameter(const MDTemplateTypeParameter *, const ValueEnumerator &, BitstreamWriter &, diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp index 560f71f..29de2f2 100644 --- a/llvm/lib/IR/AsmWriter.cpp +++ b/llvm/lib/IR/AsmWriter.cpp @@ -1660,10 +1660,24 @@ static void writeMDLexicalBlockFile(raw_ostream &Out, Out << ")"; } -static void writeMDNamespace(raw_ostream &, const MDNamespace *, TypePrinting *, - SlotTracker *, const Module *) { - llvm_unreachable("write not implemented"); +static void writeMDNamespace(raw_ostream &Out, const MDNamespace *N, + TypePrinting *TypePrinter, SlotTracker *Machine, + const Module *Context) { + Out << "!MDNamespace("; + 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); + } + if (!N->getName().empty()) + Out << FS << "name: \"" << N->getName() << "\""; + if (N->getLine()) + Out << FS << "line: " << N->getLine(); + Out << ")"; } + static void writeMDTemplateTypeParameter(raw_ostream &, const MDTemplateTypeParameter *, TypePrinting *, SlotTracker *, diff --git a/llvm/test/Assembler/invalid-mdnamespace-missing-namespace.ll b/llvm/test/Assembler/invalid-mdnamespace-missing-namespace.ll new file mode 100644 index 0000000..da2f511 --- /dev/null +++ b/llvm/test/Assembler/invalid-mdnamespace-missing-namespace.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+1]]:36: error: missing required field 'scope' +!0 = !MDNamespace(name: "Namespace") diff --git a/llvm/test/Assembler/mdnamespace.ll b/llvm/test/Assembler/mdnamespace.ll new file mode 100644 index 0000000..205ee04 --- /dev/null +++ b/llvm/test/Assembler/mdnamespace.ll @@ -0,0 +1,16 @@ +; 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} + +!0 = distinct !{} +!1 = !{!"path/to/file", !"/path/to/dir"} +!2 = !MDFile(filename: "path/to/file", directory: "/path/to/dir") + +; CHECK: !3 = !MDNamespace(scope: !0, file: !2, name: "Namespace", line: 7) +!3 = !MDNamespace(scope: !0, file: !2, name: "Namespace", line: 7) + +; CHECK: !4 = !MDNamespace(scope: !0) +!4 = !MDNamespace(scope: !0, file: null, name: "", line: 0) +!5 = !MDNamespace(scope: !0) -- 2.7.4