<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Feb 12, 2015 at 6:47 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"><div class="HOEnZb"><div class="h5"><br>
> On 2015-Feb-12, at 18:34, David Blaikie <<a href="mailto:dblaikie@gmail.com">dblaikie@gmail.com</a>> wrote:<br>
><br>
><br>
><br>
> On Thu, Feb 12, 2015 at 5:14 PM, Duncan P. N. Exon Smith <<a href="mailto:dexonsmith@apple.com">dexonsmith@apple.com</a>> wrote:<br>
> Author: dexonsmith<br>
> Date: Thu Feb 12 19:14:58 2015<br>
> New Revision: 229005<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229005&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=229005&view=rev</a><br>
> Log:<br>
> AsmWriter/Bitcode: MDBasicType<br>
><br>
> Added:<br>
> llvm/trunk/test/Assembler/invalid-mdbasictype-missing-tag.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=229005&r1=229004&r2=229005&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h?rev=229005&r1=229004&r2=229005&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:58 2015<br>
> @@ -149,7 +149,8 @@ namespace bitc {<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_ENUMERATOR = 14 // [distinct, value, name?]<br>
> + METADATA_ENUMERATOR = 14, // [distinct, value, name?]<br>
> + METADATA_BASIC_TYPE = 15 // [distinct, tag, name, size, align, enc]<br>
><br>
> Looks like the last field ended up being called 'encoding', not 'enc'.<br>
<br>
</div></div>I was just looking for 80-columns here. 'encoding' didn't fit.<br>
<br>
Do you find this useful, even? I wonder if I should just remove<br>
these comments. It's duplicated from the actual code in `BitcodeWriter`,<br>
and I figure it's liable to get stale.<br></blockquote><div><br>Probably. Hopefully if we tabularize the real code sufficiently, it'll be a legible summary.<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="HOEnZb"><div class="h5"><br>
><br>
> };<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=229005&r1=229004&r2=229005&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfoMetadata.h?rev=229005&r1=229004&r2=229005&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:58 2015<br>
> @@ -381,6 +381,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>
> switch (MD->getMetadataID()) {<br>
> default:<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=229005&r1=229004&r2=229005&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=229005&r1=229004&r2=229005&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/AsmParser/LLParser.cpp (original)<br>
> +++ llvm/trunk/lib/AsmParser/LLParser.cpp Thu Feb 12 19:14:58 2015<br>
> @@ -3194,9 +3194,23 @@ bool LLParser::ParseMDEnumerator(MDNode<br>
> return false;<br>
> }<br>
><br>
> +/// ParseMDBasicType:<br>
> +/// ::= !MDBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32)<br>
> bool LLParser::ParseMDBasicType(MDNode *&Result, bool IsDistinct) {<br>
> - return TokError("unimplemented parser");<br>
> +#define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \<br>
> + REQUIRED(tag, DwarfTagField, ); \<br>
> + OPTIONAL(name, MDStringField, ); \<br>
> + OPTIONAL(size, MDUnsignedField, (0, UINT32_MAX)); \<br>
> + OPTIONAL(align, MDUnsignedField, (0, UINT32_MAX)); \<br>
> + OPTIONAL(encoding, MDUnsignedField, (0, UINT32_MAX));<br>
> + PARSE_MD_FIELDS();<br>
> +#undef VISIT_MD_FIELDS<br>
> +<br>
> + Result = GET_OR_DISTINCT(MDBasicType, (Context, tag.Val, name.Val, size.Val,<br>
> + align.Val, encoding.Val));<br>
> + return false;<br>
> }<br>
> +<br>
> bool LLParser::ParseMDDerivedType(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=229005&r1=229004&r2=229005&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=229005&r1=229004&r2=229005&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:58 2015<br>
> @@ -1371,6 +1371,17 @@ std::error_code BitcodeReader::ParseMeta<br>
> NextMDValueNo++);<br>
> break;<br>
> }<br>
> + case bitc::METADATA_BASIC_TYPE: {<br>
> + if (Record.size() != 6)<br>
> + return Error("Invalid record");<br>
> +<br>
> + MDValueList.AssignValue(<br>
> + GET_OR_DISTINCT(MDBasicType, Record[0],<br>
> + (Context, Record[1], getMDString(Record[2]),<br>
> + Record[3], Record[4], Record[5])),<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=229005&r1=229004&r2=229005&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=229005&r1=229004&r2=229005&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:58 2015<br>
> @@ -838,11 +838,21 @@ static void WriteMDEnumerator(const MDEn<br>
> Record.clear();<br>
> }<br>
><br>
> -static void WriteMDBasicType(const MDBasicType *, const ValueEnumerator &,<br>
> - BitstreamWriter &, SmallVectorImpl<uint64_t> &,<br>
> - unsigned) {<br>
> - llvm_unreachable("write not implemented");<br>
> +static void WriteMDBasicType(const MDBasicType *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(N->getTag());<br>
> + Record.push_back(VE.getMetadataOrNullID(N->getRawName()));<br>
> + Record.push_back(N->getSizeInBits());<br>
> + Record.push_back(N->getAlignInBits());<br>
> + Record.push_back(N->getEncoding());<br>
> +<br>
> + Stream.EmitRecord(bitc::METADATA_BASIC_TYPE, Record, Abbrev);<br>
> + Record.clear();<br>
> }<br>
> +<br>
> static void WriteMDDerivedType(const MDDerivedType *, 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=229005&r1=229004&r2=229005&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AsmWriter.cpp?rev=229005&r1=229004&r2=229005&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/IR/AsmWriter.cpp (original)<br>
> +++ llvm/trunk/lib/IR/AsmWriter.cpp Thu Feb 12 19:14:58 2015<br>
> @@ -1366,10 +1366,22 @@ static void writeMDEnumerator(raw_ostrea<br>
> Out << ")";<br>
> }<br>
><br>
> -static void writeMDBasicType(raw_ostream &, const MDBasicType *, TypePrinting *,<br>
> - SlotTracker *, const Module *) {<br>
> - llvm_unreachable("write not implemented");<br>
> +static void writeMDBasicType(raw_ostream &Out, const MDBasicType *N,<br>
> + TypePrinting *, SlotTracker *, const Module *) {<br>
> + Out << "!MDBasicType(";<br>
> + FieldSeparator FS;<br>
> + writeTag(Out, FS, N);<br>
> + if (!N->getName().empty())<br>
> + Out << FS << "name: \"" << N->getName() << "\"";<br>
> + if (N->getSizeInBits())<br>
> + Out << FS << "size: " << N->getSizeInBits();<br>
> + if (N->getAlignInBits())<br>
> + Out << FS << "align: " << N->getAlignInBits();<br>
> + if (N->getEncoding())<br>
> + Out << FS << "encoding: " << N->getEncoding();<br>
> + Out << ")";<br>
> }<br>
> +<br>
> static void writeMDDerivedType(raw_ostream &, const MDDerivedType *,<br>
> TypePrinting *, 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=229005&r1=229004&r2=229005&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/debug-info.ll?rev=229005&r1=229004&r2=229005&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:58 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, !3, !4, !5}<br>
> -!named = !{!0, !1, !2, !3, !4, !5, !6}<br>
> +; CHECK: !named = !{!0, !0, !1, !2, !3, !4, !5, !6, !7, !8, !8}<br>
> +!named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9, !10}<br>
><br>
> ; CHECK: !0 = !MDSubrange(count: 3)<br>
> ; CHECK-NEXT: !1 = !MDSubrange(count: 3, lowerBound: 4)<br>
> @@ -19,3 +19,11 @@<br>
> !4 = !MDEnumerator(value: 7, name: "seven")<br>
> !5 = !MDEnumerator(value: -8, name: "negeight")<br>
> !6 = !MDEnumerator(value: 0, name: "")<br>
> +<br>
> +; CHECK-NEXT: !6 = !MDBasicType(tag: DW_TAG_base_type, name: "name", size: 1, align: 2, encoding: 3)<br>
> +; CHECK-NEXT: !7 = !MDBasicType(tag: DW_TAG_unspecified_type, name: "decltype(nullptr)")<br>
> +; CHECK-NEXT: !8 = !MDBasicType(tag: DW_TAG_base_type)<br>
> +!7 = !MDBasicType(tag: DW_TAG_base_type, name: "name", size: 1, align: 2, encoding: 3)<br>
> +!8 = !MDBasicType(tag: DW_TAG_unspecified_type, name: "decltype(nullptr)")<br>
> +!9 = !MDBasicType(tag: DW_TAG_base_type)<br>
> +!10 = !MDBasicType(tag: DW_TAG_base_type, name: "", size: 0, align: 0, encoding: 0)<br>
><br>
> Added: llvm/trunk/test/Assembler/invalid-mdbasictype-missing-tag.ll<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdbasictype-missing-tag.ll?rev=229005&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdbasictype-missing-tag.ll?rev=229005&view=auto</a><br>
> ==============================================================================<br>
> --- llvm/trunk/test/Assembler/invalid-mdbasictype-missing-tag.ll (added)<br>
> +++ llvm/trunk/test/Assembler/invalid-mdbasictype-missing-tag.ll Thu Feb 12 19:14:58 2015<br>
> @@ -0,0 +1,4 @@<br>
> +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s<br>
> +<br>
> +; CHECK: [[@LINE+1]]:31: error: missing required field 'tag'<br>
> +!0 = !MDBasicType(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>
<br>
</div></div></blockquote></div><br></div></div>