<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Feb 12, 2015 at 5:32 PM, Duncan P. N. Exon Smith <span dir="ltr"><<a href="mailto:dexonsmith@apple.com" target="_blank">dexonsmith@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dexonsmith<br>
Date: Thu Feb 12 19:32:09 2015<br>
New Revision: 229018<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229018&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=229018&view=rev</a><br>
Log:<br>
AsmWriter/Bitcode: MDNamespace<br>
<br>
Added:<br>
llvm/trunk/test/Assembler/invalid-mdnamespace-missing-namespace.ll<br>
llvm/trunk/test/Assembler/mdnamespace.ll<br>
Modified:<br>
llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h<br>
llvm/trunk/include/llvm/IR/DebugInfoMetadata.h<br>
llvm/trunk/lib/AsmParser/LLParser.cpp<br>
llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp<br>
llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp<br>
llvm/trunk/lib/IR/AsmWriter.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h?rev=229018&r1=229017&r2=229018&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h?rev=229018&r1=229017&r2=229018&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h (original)<br>
+++ llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h Thu Feb 12 19:32:09 2015<br>
@@ -158,7 +158,8 @@ namespace bitc {<br>
METADATA_COMPILE_UNIT = 20, // [distinct, ...]<br>
METADATA_SUBPROGRAM = 21, // [distinct, ...]<br>
METADATA_LEXICAL_BLOCK = 22, // [distinct, scope, file, line, column]<br>
- METADATA_LEXICAL_BLOCK_FILE=23// [distinct, scope, file, discriminator]<br>
+ METADATA_LEXICAL_BLOCK_FILE=23,//[distinct, scope, file, discriminator]<br>
+ METADATA_NAMESPACE = 24 // [distinct, scope, file, name, line]<br></blockquote><div><br>Did you want to indicate field optionality with '?' in these lists (looks like file, name, and line are all optional for namespaces)<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
};<br>
<br>
// The constants block (CONSTANTS_BLOCK_ID) describes emission for each<br>
<br>
Modified: llvm/trunk/include/llvm/IR/DebugInfoMetadata.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfoMetadata.h?rev=229018&r1=229017&r2=229018&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfoMetadata.h?rev=229018&r1=229017&r2=229018&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/IR/DebugInfoMetadata.h (original)<br>
+++ llvm/trunk/include/llvm/IR/DebugInfoMetadata.h Thu Feb 12 19:32:09 2015<br>
@@ -1104,6 +1104,8 @@ public:<br>
Metadata *getScope() const { return getOperand(1); }<br>
StringRef getName() const { return getStringOperand(2); }<br>
<br>
+ MDString *getRawName() const { return getOperandAs<MDString>(2); }<br>
+<br>
static bool classof(const Metadata *MD) {<br>
return MD->getMetadataID() == MDNamespaceKind;<br>
}<br>
<br>
Modified: llvm/trunk/lib/AsmParser/LLParser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=229018&r1=229017&r2=229018&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=229018&r1=229017&r2=229018&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)<br>
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Thu Feb 12 19:32:09 2015<br>
@@ -3497,9 +3497,22 @@ bool LLParser::ParseMDLexicalBlockFile(M<br>
return false;<br>
}<br>
<br>
+/// ParseMDNamespace:<br>
+/// ::= !MDNamespace(scope: !0, file: !2, name: "SomeNamespace", line: 9)<br>
bool LLParser::ParseMDNamespace(MDNode *&Result, bool IsDistinct) {<br>
- return TokError("unimplemented parser");<br>
+#define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \<br>
+ REQUIRED(scope, MDField, ); \<br>
+ OPTIONAL(file, MDField, ); \<br>
+ OPTIONAL(name, MDStringField, ); \<br>
+ OPTIONAL(line, LineField, );<br>
+ PARSE_MD_FIELDS();<br>
+#undef VISIT_MD_FIELDS<br>
+<br>
+ Result = GET_OR_DISTINCT(MDNamespace,<br>
+ (Context, scope.Val, file.Val, name.Val, line.Val));<br>
+ return false;<br>
}<br>
+<br>
bool LLParser::ParseMDTemplateTypeParameter(MDNode *&Result, bool IsDistinct) {<br>
return TokError("unimplemented parser");<br>
}<br>
<br>
Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=229018&r1=229017&r2=229018&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=229018&r1=229017&r2=229018&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)<br>
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Thu Feb 12 19:32:09 2015<br>
@@ -1490,6 +1490,18 @@ std::error_code BitcodeReader::ParseMeta<br>
NextMDValueNo++);<br>
break;<br>
}<br>
+ case bitc::METADATA_NAMESPACE: {<br>
+ if (Record.size() != 5)<br>
+ return Error("Invalid record");<br>
+<br>
+ MDValueList.AssignValue(<br>
+ GET_OR_DISTINCT(MDNamespace, Record[0],<br>
+ (Context, getMDOrNull(Record[1]),<br>
+ getMDOrNull(Record[2]), getMDString(Record[3]),<br>
+ Record[4])),<br>
+ NextMDValueNo++);<br>
+ break;<br>
+ }<br>
case bitc::METADATA_STRING: {<br>
std::string String(Record.begin(), Record.end());<br>
llvm::UpgradeMDStringConstant(String);<br>
<br>
Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=229018&r1=229017&r2=229018&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=229018&r1=229017&r2=229018&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)<br>
+++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Thu Feb 12 19:32:09 2015<br>
@@ -1007,11 +1007,20 @@ static void WriteMDLexicalBlockFile(cons<br>
Record.clear();<br>
}<br>
<br>
-static void WriteMDNamespace(const MDNamespace *, const ValueEnumerator &,<br>
- BitstreamWriter &, SmallVectorImpl<uint64_t> &,<br>
- unsigned) {<br>
- llvm_unreachable("write not implemented");<br>
+static void WriteMDNamespace(const MDNamespace *N, const ValueEnumerator &VE,<br>
+ BitstreamWriter &Stream,<br>
+ SmallVectorImpl<uint64_t> &Record,<br>
+ unsigned Abbrev) {<br>
+ Record.push_back(N->isDistinct());<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getScope()));<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getFile()));<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getRawName()));<br>
+ Record.push_back(N->getLine());<br>
+<br>
+ Stream.EmitRecord(bitc::METADATA_NAMESPACE, Record, Abbrev);<br>
+ Record.clear();<br>
}<br>
+<br>
static void WriteMDTemplateTypeParameter(const MDTemplateTypeParameter *,<br>
const ValueEnumerator &,<br>
BitstreamWriter &,<br>
<br>
Modified: llvm/trunk/lib/IR/AsmWriter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AsmWriter.cpp?rev=229018&r1=229017&r2=229018&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AsmWriter.cpp?rev=229018&r1=229017&r2=229018&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/AsmWriter.cpp (original)<br>
+++ llvm/trunk/lib/IR/AsmWriter.cpp Thu Feb 12 19:32:09 2015<br>
@@ -1660,10 +1660,24 @@ static void writeMDLexicalBlockFile(raw_<br>
Out << ")";<br>
}<br>
<br>
-static void writeMDNamespace(raw_ostream &, const MDNamespace *, TypePrinting *,<br>
- SlotTracker *, const Module *) {<br>
- llvm_unreachable("write not implemented");<br>
+static void writeMDNamespace(raw_ostream &Out, const MDNamespace *N,<br>
+ TypePrinting *TypePrinter, SlotTracker *Machine,<br>
+ const Module *Context) {<br>
+ Out << "!MDNamespace(";<br>
+ FieldSeparator FS;<br>
+ Out << FS << "scope: ";<br>
+ writeMetadataAsOperand(Out, N->getScope(), TypePrinter, Machine, Context);<br>
+ if (N->getFile()) {<br>
+ Out << FS << "file: ";<br>
+ writeMetadataAsOperand(Out, N->getFile(), TypePrinter, Machine, Context);<br>
+ }<br>
+ if (!N->getName().empty())<br>
+ Out << FS << "name: \"" << N->getName() << "\"";<br>
+ if (N->getLine())<br>
+ Out << FS << "line: " << N->getLine();<br>
+ Out << ")";<br>
}<br>
+<br>
static void writeMDTemplateTypeParameter(raw_ostream &,<br>
const MDTemplateTypeParameter *,<br>
TypePrinting *, SlotTracker *,<br>
<br>
Added: llvm/trunk/test/Assembler/invalid-mdnamespace-missing-namespace.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdnamespace-missing-namespace.ll?rev=229018&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdnamespace-missing-namespace.ll?rev=229018&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/invalid-mdnamespace-missing-namespace.ll (added)<br>
+++ llvm/trunk/test/Assembler/invalid-mdnamespace-missing-namespace.ll Thu Feb 12 19:32:09 2015<br>
@@ -0,0 +1,4 @@<br>
+; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s<br>
+<br>
+; CHECK: [[@LINE+1]]:36: error: missing required field 'scope'<br>
+!0 = !MDNamespace(name: "Namespace")<br>
<br>
Added: llvm/trunk/test/Assembler/mdnamespace.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/mdnamespace.ll?rev=229018&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/mdnamespace.ll?rev=229018&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/mdnamespace.ll (added)<br>
+++ llvm/trunk/test/Assembler/mdnamespace.ll Thu Feb 12 19:32:09 2015<br>
@@ -0,0 +1,16 @@<br>
+; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s<br>
+; RUN: verify-uselistorder %s<br>
+<br>
+; CHECK: !named = !{!0, !1, !2, !3, !4, !4}<br>
+!named = !{!0, !1, !2, !3, !4, !5}<br>
+<br>
+!0 = distinct !{}<br>
+!1 = !{!"path/to/file", !"/path/to/dir"}<br>
+!2 = !MDFile(filename: "path/to/file", directory: "/path/to/dir")<br>
+<br>
+; CHECK: !3 = !MDNamespace(scope: !0, file: !2, name: "Namespace", line: 7)<br>
+!3 = !MDNamespace(scope: !0, file: !2, name: "Namespace", line: 7)<br>
+<br>
+; CHECK: !4 = !MDNamespace(scope: !0)<br>
+!4 = !MDNamespace(scope: !0, file: null, name: "", line: 0)<br>
+!5 = !MDNamespace(scope: !0)<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>