<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Feb 12, 2015 at 5:25 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:25:10 2015<br>
New Revision: 229013<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229013&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=229013&view=rev</a><br>
Log:<br>
AsmWriter/Bitcode: MDCompileUnit<br>
<br>
Added:<br>
llvm/trunk/test/Assembler/invalid-mdcompileunit-language-bad.ll<br>
llvm/trunk/test/Assembler/invalid-mdcompileunit-language-overflow.ll<br>
llvm/trunk/test/Assembler/invalid-mdcompileunit-missing-language.ll<br>
llvm/trunk/test/Assembler/mdcompileunit.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=229013&r1=229012&r2=229013&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h?rev=229013&r1=229012&r2=229013&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:25:10 2015<br>
@@ -154,7 +154,8 @@ namespace bitc {<br>
METADATA_FILE = 16, // [distinct, filename, directory]<br>
METADATA_DERIVED_TYPE = 17, // [distinct, ...]<br>
METADATA_COMPOSITE_TYPE= 18, // [distinct, ...]<br>
- METADATA_SUBROUTINE_TYPE= 19 // [distinct, flags, types]<br>
+ METADATA_SUBROUTINE_TYPE=19, // [distinct, flags, types]<br>
+ METADATA_COMPILE_UNIT = 20 // [distinct, ...]<br></blockquote><div><br>Also missing the schema.<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=229013&r1=229012&r2=229013&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfoMetadata.h?rev=229013&r1=229012&r2=229013&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:25:10 2015<br>
@@ -844,6 +844,12 @@ public:<br>
Metadata *getGlobalVariables() const { return getOperand(7); }<br>
Metadata *getImportedEntities() const { return getOperand(8); }<br>
<br>
+ MDString *getRawProducer() const { return getOperandAs<MDString>(1); }<br>
+ MDString *getRawFlags() const { return getOperandAs<MDString>(2); }<br>
+ MDString *getRawSplitDebugFilename() const {<br>
+ return getOperandAs<MDString>(3);<br>
+ }<br>
+<br>
static bool classof(const Metadata *MD) {<br>
return MD->getMetadataID() == MDCompileUnitKind;<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=229013&r1=229012&r2=229013&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=229013&r1=229012&r2=229013&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)<br>
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Thu Feb 12 19:25:10 2015<br>
@@ -3352,9 +3352,39 @@ bool LLParser::ParseMDFile(MDNode *&Resu<br>
return false;<br>
}<br>
<br>
+/// ParseMDCompileUnit:<br>
+/// ::= !MDCompileUnit(language: DW_LANG_C99, file: !0, producer: "clang",<br>
+/// isOptimized: true, flags: "-O2", runtimeVersion: 1,<br>
+/// splitDebugFilename: "abc.debug", emissionKind: 1,<br>
+/// enums: !1, retainedTypes: !2, subprograms: !3,<br>
+/// globals: !4, imports: !5)<br>
bool LLParser::ParseMDCompileUnit(MDNode *&Result, bool IsDistinct) {<br>
- return TokError("unimplemented parser");<br>
+#define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \<br>
+ REQUIRED(language, DwarfLangField, ); \<br>
+ REQUIRED(file, MDField, ); \<br>
+ OPTIONAL(producer, MDStringField, ); \<br>
+ OPTIONAL(isOptimized, MDBoolField, ); \<br>
+ OPTIONAL(flags, MDStringField, ); \<br>
+ OPTIONAL(runtimeVersion, MDUnsignedField, (0, UINT32_MAX)); \<br>
+ OPTIONAL(splitDebugFilename, MDStringField, ); \<br>
+ OPTIONAL(emissionKind, MDUnsignedField, (0, UINT32_MAX)); \<br>
+ OPTIONAL(enums, MDField, ); \<br>
+ OPTIONAL(retainedTypes, MDField, ); \<br>
+ OPTIONAL(subprograms, MDField, ); \<br>
+ OPTIONAL(globals, MDField, ); \<br>
+ OPTIONAL(imports, MDField, );<br>
+ PARSE_MD_FIELDS();<br>
+#undef VISIT_MD_FIELDS<br>
+<br>
+ Result = GET_OR_DISTINCT(MDCompileUnit,<br>
+ (Context, language.Val, file.Val, producer.Val,<br>
+ isOptimized.Val, flags.Val, runtimeVersion.Val,<br>
+ splitDebugFilename.Val, emissionKind.Val, enums.Val,<br>
+ retainedTypes.Val, subprograms.Val, globals.Val,<br>
+ imports.Val));<br>
+ return false;<br>
}<br>
+<br>
bool LLParser::ParseMDSubprogram(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=229013&r1=229012&r2=229013&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=229013&r1=229012&r2=229013&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:25:10 2015<br>
@@ -1437,6 +1437,21 @@ std::error_code BitcodeReader::ParseMeta<br>
NextMDValueNo++);<br>
break;<br>
}<br>
+ case bitc::METADATA_COMPILE_UNIT: {<br>
+ if (Record.size() != 14)<br>
+ return Error("Invalid record");<br>
+<br>
+ MDValueList.AssignValue(<br>
+ GET_OR_DISTINCT(<br>
+ MDCompileUnit, Record[0],<br>
+ (Context, Record[1], getMD(Record[2]), getMDString(Record[3]),<br>
+ Record[4], getMDString(Record[5]), Record[6],<br>
+ getMDString(Record[7]), Record[8], getMDOrNull(Record[9]),<br>
+ getMDOrNull(Record[10]), getMDOrNull(Record[11]),<br>
+ getMDOrNull(Record[12]), getMDOrNull(Record[13]))),<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=229013&r1=229012&r2=229013&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=229013&r1=229012&r2=229013&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:25:10 2015<br>
@@ -925,11 +925,30 @@ static void WriteMDFile(const MDFile *N,<br>
Record.clear();<br>
}<br>
<br>
-static void WriteMDCompileUnit(const MDCompileUnit *, const ValueEnumerator &,<br>
- BitstreamWriter &, SmallVectorImpl<uint64_t> &,<br>
- unsigned) {<br>
- llvm_unreachable("write not implemented");<br>
+static void WriteMDCompileUnit(const MDCompileUnit *N,<br>
+ 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->getSourceLanguage());<br>
+ Record.push_back(VE.getMetadataID(N->getFile()));<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getRawProducer()));<br>
+ Record.push_back(N->isOptimized());<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getRawFlags()));<br>
+ Record.push_back(N->getRuntimeVersion());<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getRawSplitDebugFilename()));<br>
+ Record.push_back(N->getEmissionKind());<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getEnumTypes()));<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getRetainedTypes()));<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getSubprograms()));<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getGlobalVariables()));<br>
+ Record.push_back(VE.getMetadataOrNullID(N->getImportedEntities()));<br>
+<br>
+ Stream.EmitRecord(bitc::METADATA_COMPILE_UNIT, Record, Abbrev);<br>
+ Record.clear();<br>
}<br>
+<br>
static void WriteMDSubprogram(const MDSubprogram *, 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=229013&r1=229012&r2=229013&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AsmWriter.cpp?rev=229013&r1=229012&r2=229013&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/AsmWriter.cpp (original)<br>
+++ llvm/trunk/lib/IR/AsmWriter.cpp Thu Feb 12 19:25:10 2015<br>
@@ -1505,10 +1505,58 @@ static void writeMDFile(raw_ostream &Out<br>
Out << ")";<br>
}<br>
<br>
-static void writeMDCompileUnit(raw_ostream &, const MDCompileUnit *,<br>
- TypePrinting *, SlotTracker *, const Module *) {<br>
- llvm_unreachable("write not implemented");<br>
+static void writeMDCompileUnit(raw_ostream &Out, const MDCompileUnit *N,<br>
+ TypePrinting *TypePrinter, SlotTracker *Machine,<br>
+ const Module *Context) {<br>
+ Out << "!MDCompileUnit(";<br>
+ FieldSeparator FS;<br>
+ Out << FS << "language: ";<br>
+ if (const char *Lang = dwarf::LanguageString(N->getSourceLanguage()))<br>
+ Out << Lang;<br>
+ else<br>
+ Out << N->getSourceLanguage();<br>
+ if (N->getFile()) {<br>
+ Out << FS << "file: ";<br>
+ writeMetadataAsOperand(Out, N->getFile(), TypePrinter, Machine,<br>
+ Context);<br>
+ }<br>
+ if (!N->getProducer().empty())<br>
+ Out << FS << "producer: \"" << N->getProducer() << "\"";<br>
+ Out << FS << "isOptimized: " << (N->isOptimized() ? "true" : "false");<br>
+ if (!N->getFlags().empty())<br>
+ Out << FS << "flags: \"" << N->getFlags() << "\"";<br>
+ Out << FS << "runtimeVersion: " << N->getRuntimeVersion();<br>
+ if (!N->getSplitDebugFilename().empty())<br>
+ Out << FS << "splitDebugFilename: \"" << N->getSplitDebugFilename() << "\"";<br>
+ Out << FS << "emissionKind: " << N->getEmissionKind();<br>
+ if (N->getEnumTypes()) {<br>
+ Out << FS << "enums: ";<br>
+ writeMetadataAsOperand(Out, N->getEnumTypes(), TypePrinter, Machine,<br>
+ Context);<br>
+ }<br>
+ if (N->getRetainedTypes()) {<br>
+ Out << FS << "retainedTypes: ";<br>
+ writeMetadataAsOperand(Out, N->getRetainedTypes(), TypePrinter, Machine,<br>
+ Context);<br>
+ }<br>
+ if (N->getSubprograms()) {<br>
+ Out << FS << "subprograms: ";<br>
+ writeMetadataAsOperand(Out, N->getSubprograms(), TypePrinter, Machine,<br>
+ Context);<br>
+ }<br>
+ if (N->getGlobalVariables()) {<br>
+ Out << FS << "globals: ";<br>
+ writeMetadataAsOperand(Out, N->getGlobalVariables(), TypePrinter, Machine,<br>
+ Context);<br>
+ }<br>
+ if (N->getImportedEntities()) {<br>
+ Out << FS << "imports: ";<br>
+ writeMetadataAsOperand(Out, N->getImportedEntities(), TypePrinter, Machine,<br>
+ Context);<br>
+ }<br>
+ Out << ")";<br>
}<br>
+<br>
static void writeMDSubprogram(raw_ostream &, const MDSubprogram *,<br>
TypePrinting *, SlotTracker *, const Module *) {<br>
llvm_unreachable("write not implemented");<br>
<br>
Added: llvm/trunk/test/Assembler/invalid-mdcompileunit-language-bad.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdcompileunit-language-bad.ll?rev=229013&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdcompileunit-language-bad.ll?rev=229013&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/invalid-mdcompileunit-language-bad.ll (added)<br>
+++ llvm/trunk/test/Assembler/invalid-mdcompileunit-language-bad.ll Thu Feb 12 19:25:10 2015<br>
@@ -0,0 +1,5 @@<br>
+; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s<br>
+<br>
+; CHECK: <stdin>:[[@LINE+1]]:31: error: invalid DWARF language 'DW_LANG_NoSuchLanguage'<br>
+!0 = !MDCompileUnit(language: DW_LANG_NoSuchLanguage,<br>
+ file: !MDFile(filename: "a", directory: "b"))<br>
<br>
Added: llvm/trunk/test/Assembler/invalid-mdcompileunit-language-overflow.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdcompileunit-language-overflow.ll?rev=229013&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdcompileunit-language-overflow.ll?rev=229013&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/invalid-mdcompileunit-language-overflow.ll (added)<br>
+++ llvm/trunk/test/Assembler/invalid-mdcompileunit-language-overflow.ll Thu Feb 12 19:25:10 2015<br>
@@ -0,0 +1,9 @@<br>
+; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s<br>
+<br>
+; CHECK-NOT: error<br>
+!0 = !MDCompileUnit(language: 65535,<br>
+ file: !MDFile(filename: "a", directory: "b"))<br>
+<br>
+; CHECK: <stdin>:[[@LINE+1]]:31: error: value for 'language' too large, limit is 65535<br>
+!1 = !MDCompileUnit(language: 65536,<br>
+ file: !MDFile(filename: "a", directory: "b"))<br>
<br>
Added: llvm/trunk/test/Assembler/invalid-mdcompileunit-missing-language.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdcompileunit-missing-language.ll?rev=229013&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdcompileunit-missing-language.ll?rev=229013&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/invalid-mdcompileunit-missing-language.ll (added)<br>
+++ llvm/trunk/test/Assembler/invalid-mdcompileunit-missing-language.ll Thu Feb 12 19:25:10 2015<br>
@@ -0,0 +1,4 @@<br>
+; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s<br>
+<br>
+; CHECK: <stdin>:[[@LINE+1]]:65: error: missing required field 'language'<br>
+!0 = !MDCompileUnit(file: !MDFile(filename: "a", directory: "b"))<br>
<br>
Added: llvm/trunk/test/Assembler/mdcompileunit.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/mdcompileunit.ll?rev=229013&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/mdcompileunit.ll?rev=229013&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/mdcompileunit.ll (added)<br>
+++ llvm/trunk/test/Assembler/mdcompileunit.ll Thu Feb 12 19:25:10 2015<br>
@@ -0,0 +1,31 @@<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, !5, !6, !7, !7, !8, !8}<br>
+!named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9, !10}<br>
+<br>
+!0 = !{!"path/to/file", !"/path/to/dir"}<br>
+!1 = !MDFile(filename: "path/to/file", directory: "/path/to/dir")<br>
+!2 = distinct !{}<br>
+!3 = distinct !{}<br>
+!4 = distinct !{}<br>
+!5 = distinct !{}<br>
+!6 = distinct !{}<br>
+<br>
+; CHECK: !7 = !MDCompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: true, flags: "-O2", runtimeVersion: 2, splitDebugFilename: "abc.debug", emissionKind: 3, enums: !2, retainedTypes: !3, subprograms: !4, globals: !5, imports: !6)<br>
+!7 = !MDCompileUnit(language: DW_LANG_C99, file: !1, producer: "clang",<br>
+ isOptimized: true, flags: "-O2", runtimeVersion: 2,<br>
+ splitDebugFilename: "abc.debug", emissionKind: 3,<br>
+ enums: !2, retainedTypes: !3, subprograms: !4,<br>
+ globals: !5, imports: !6)<br>
+!8 = !MDCompileUnit(language: 12, file: !1, producer: "clang",<br>
+ isOptimized: true, flags: "-O2", runtimeVersion: 2,<br>
+ splitDebugFilename: "abc.debug", emissionKind: 3,<br>
+ enums: !2, retainedTypes: !3, subprograms: !4,<br>
+ globals: !5, imports: !6)<br>
+<br>
+; CHECK: !8 = !MDCompileUnit(language: DW_LANG_C99, file: !1, isOptimized: false, runtimeVersion: 0, emissionKind: 0)<br>
+!9 = !MDCompileUnit(language: 12, file: !1, producer: "",<br>
+ isOptimized: false, flags: "", runtimeVersion: 0,<br>
+ splitDebugFilename: "", emissionKind: 0)<br>
+!10 = !MDCompileUnit(language: 12, file: !1)<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>