<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Feb 12, 2015 at 5:14 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:14:11 2015<br>
New Revision: 229004<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229004&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=229004&view=rev</a><br>
Log:<br>
AsmWriter/Bitcode: MDEnumerator<br>
<br>
Added:<br>
llvm/trunk/test/Assembler/invalid-mdenumerator-missing-name.ll<br>
llvm/trunk/test/Assembler/invalid-mdenumerator-missing-value.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>
llvm/trunk/test/Assembler/debug-info.ll<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=229004&r1=229003&r2=229004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h?rev=229004&r1=229003&r2=229004&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:14:11 2015<br>
@@ -148,7 +148,8 @@ namespace bitc {<br>
METADATA_NAMED_NODE = 10, // NAMED_NODE: [n x mdnodes]<br>
METADATA_ATTACHMENT = 11, // [m x [value, [n x [id, mdnode]]]<br>
METADATA_GENERIC_DEBUG = 12, // [distinct, tag, vers, header, n x md num]<br>
- METADATA_SUBRANGE = 13 // [distinct, count, lo]<br>
+ METADATA_SUBRANGE = 13, // [distinct, count, lo]<br>
+ METADATA_ENUMERATOR = 14 // [distinct, value, name?]<br></blockquote><div><br>Test cases seem to indicate that name is mandatory? (I assume the '?' was meant to indicate optionality)<br><br>Also - do all our compilers already support the extra ',' at the end of lists like this? They /might/ in which case you can use that to avoid having to touch the previous line when you add a new entry.<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=229004&r1=229003&r2=229004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfoMetadata.h?rev=229004&r1=229003&r2=229004&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:14:11 2015<br>
@@ -309,6 +309,8 @@ public:<br>
int64_t getValue() const { return Value; }<br>
StringRef getName() const { return getStringOperand(0); }<br>
<br>
+ MDString *getRawName() const { return getOperandAs<MDString>(0); }<br>
+<br>
static bool classof(const Metadata *MD) {<br>
return MD->getMetadataID() == MDEnumeratorKind;<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=229004&r1=229003&r2=229004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=229004&r1=229003&r2=229004&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)<br>
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Thu Feb 12 19:14:11 2015<br>
@@ -3181,9 +3181,19 @@ bool LLParser::ParseMDSubrange(MDNode *&<br>
return false;<br>
}<br>
<br>
+/// ParseMDEnumerator:<br>
+/// ::= !MDEnumerator(value: 30, name: "SomeKind")<br>
bool LLParser::ParseMDEnumerator(MDNode *&Result, bool IsDistinct) {<br>
- return TokError("unimplemented parser");<br>
+#define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \<br>
+ REQUIRED(value, MDSignedField, ); \<br>
+ REQUIRED(name, MDStringField, );<br>
+ PARSE_MD_FIELDS();<br>
+#undef VISIT_MD_FIELDS<br>
+<br>
+ Result = GET_OR_DISTINCT(MDEnumerator, (Context, value.Val, name.Val));<br>
+ return false;<br>
}<br>
+<br>
bool LLParser::ParseMDBasicType(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=229004&r1=229003&r2=229004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=229004&r1=229003&r2=229004&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:14:11 2015<br>
@@ -1361,6 +1361,16 @@ std::error_code BitcodeReader::ParseMeta<br>
NextMDValueNo++);<br>
break;<br>
}<br>
+ case bitc::METADATA_ENUMERATOR: {<br>
+ if (Record.size() != 3)<br>
+ return Error("Invalid record");<br>
+<br>
+ MDValueList.AssignValue(GET_OR_DISTINCT(MDEnumerator, Record[0],<br>
+ (Context, unrotateSign(Record[1]),<br>
+ getMDString(Record[2]))),<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=229004&r1=229003&r2=229004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=229004&r1=229003&r2=229004&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:14:11 2015<br>
@@ -826,11 +826,18 @@ static void WriteMDSubrange(const MDSubr<br>
Record.clear();<br>
}<br>
<br>
-static void WriteMDEnumerator(const MDEnumerator *, const ValueEnumerator &,<br>
- BitstreamWriter &, SmallVectorImpl<uint64_t> &,<br>
- unsigned) {<br>
- llvm_unreachable("write not implemented");<br>
+static void WriteMDEnumerator(const MDEnumerator *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(rotateSign(N->getValue()));<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getRawName()));<br>
+<br>
+ Stream.EmitRecord(bitc::METADATA_ENUMERATOR, Record, Abbrev);<br>
+ Record.clear();<br>
}<br>
+<br>
static void WriteMDBasicType(const MDBasicType *, const ValueEnumerator &,<br>
BitstreamWriter &, SmallVectorImpl<uint64_t> &,<br>
unsigned) {<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=229004&r1=229003&r2=229004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AsmWriter.cpp?rev=229004&r1=229003&r2=229004&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/AsmWriter.cpp (original)<br>
+++ llvm/trunk/lib/IR/AsmWriter.cpp Thu Feb 12 19:14:11 2015<br>
@@ -1357,10 +1357,15 @@ static void writeMDSubrange(raw_ostream<br>
Out << ")";<br>
}<br>
<br>
-static void writeMDEnumerator(raw_ostream &, const MDEnumerator *,<br>
+static void writeMDEnumerator(raw_ostream &Out, const MDEnumerator *N,<br>
TypePrinting *, SlotTracker *, const Module *) {<br>
- llvm_unreachable("write not implemented");<br>
+ Out << "!MDEnumerator(";<br>
+ FieldSeparator FS;<br>
+ Out << FS << "value: " << N->getValue();<br>
+ Out << FS << "name: \"" << N->getName() << "\"";<br>
+ Out << ")";<br>
}<br>
+<br>
static void writeMDBasicType(raw_ostream &, const MDBasicType *, TypePrinting *,<br>
SlotTracker *, const Module *) {<br>
llvm_unreachable("write not implemented");<br>
<br>
Modified: llvm/trunk/test/Assembler/debug-info.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/debug-info.ll?rev=229004&r1=229003&r2=229004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/debug-info.ll?rev=229004&r1=229003&r2=229004&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/debug-info.ll (original)<br>
+++ llvm/trunk/test/Assembler/debug-info.ll Thu Feb 12 19:14:11 2015<br>
@@ -1,8 +1,8 @@<br>
; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s<br>
; RUN: verify-uselistorder %s<br>
<br>
-; CHECK: !named = !{!0, !0, !1, !2}<br>
-!named = !{!0, !1, !2, !3}<br>
+; CHECK: !named = !{!0, !0, !1, !2, !3, !4, !5}<br>
+!named = !{!0, !1, !2, !3, !4, !5, !6}<br>
<br>
; CHECK: !0 = !MDSubrange(count: 3)<br>
; CHECK-NEXT: !1 = !MDSubrange(count: 3, lowerBound: 4)<br>
@@ -12,3 +12,10 @@<br>
<br>
!2 = !MDSubrange(count: 3, lowerBound: 4)<br>
!3 = !MDSubrange(count: 3, lowerBound: -5)<br>
+<br>
+; CHECK-NEXT: !3 = !MDEnumerator(value: 7, name: "seven")<br>
+; CHECK-NEXT: !4 = !MDEnumerator(value: -8, name: "negeight")<br>
+; CHECK-NEXT: !5 = !MDEnumerator(value: 0, name: "")<br>
+!4 = !MDEnumerator(value: 7, name: "seven")<br>
+!5 = !MDEnumerator(value: -8, name: "negeight")<br>
+!6 = !MDEnumerator(value: 0, name: "")<br>
<br>
Added: llvm/trunk/test/Assembler/invalid-mdenumerator-missing-name.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdenumerator-missing-name.ll?rev=229004&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdenumerator-missing-name.ll?rev=229004&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/invalid-mdenumerator-missing-name.ll (added)<br>
+++ llvm/trunk/test/Assembler/invalid-mdenumerator-missing-name.ll Thu Feb 12 19:14:11 2015<br>
@@ -0,0 +1,4 @@<br>
+; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s<br>
+<br>
+; CHECK: [[@LINE+1]]:28: error: missing required field 'name'<br>
+!0 = !MDEnumerator(value: 7)<br>
<br>
Added: llvm/trunk/test/Assembler/invalid-mdenumerator-missing-value.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdenumerator-missing-value.ll?rev=229004&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdenumerator-missing-value.ll?rev=229004&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/invalid-mdenumerator-missing-value.ll (added)<br>
+++ llvm/trunk/test/Assembler/invalid-mdenumerator-missing-value.ll Thu Feb 12 19:14:11 2015<br>
@@ -0,0 +1,4 @@<br>
+; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s<br>
+<br>
+; CHECK: [[@LINE+1]]:32: error: missing required field 'value'<br>
+!0 = !MDEnumerator(name: "name")<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>