diff --git a/llvm/include/llvm/Bitcode/LLVMBitCodes.h b/llvm/include/llvm/Bitcode/LLVMBitCodes.h index 08feb827a3db..64d4bf98a5fe 100644 --- a/llvm/include/llvm/Bitcode/LLVMBitCodes.h +++ b/llvm/include/llvm/Bitcode/LLVMBitCodes.h @@ -159,7 +159,9 @@ namespace bitc { METADATA_SUBPROGRAM = 21, // [distinct, ...] METADATA_LEXICAL_BLOCK = 22, // [distinct, scope, file, line, column] METADATA_LEXICAL_BLOCK_FILE=23,//[distinct, scope, file, discriminator] - METADATA_NAMESPACE = 24 // [distinct, scope, file, name, line] + METADATA_NAMESPACE = 24, // [distinct, scope, file, name, line] + METADATA_TEMPLATE_TYPE = 25, // [distinct, scope, name, type, ...] + METADATA_TEMPLATE_VALUE= 26 // [distinct, scope, name, type, value, ...] }; // 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 72d5c43ca15d..071f2706eb8f 100644 --- a/llvm/include/llvm/IR/DebugInfoMetadata.h +++ b/llvm/include/llvm/IR/DebugInfoMetadata.h @@ -1129,6 +1129,8 @@ public: StringRef getName() const { return getStringOperand(1); } Metadata *getType() const { return getOperand(2); } + MDString *getRawName() const { return getOperandAs(1); } + static bool classof(const Metadata *MD) { return MD->getMetadataID() == MDTemplateTypeParameterKind || MD->getMetadataID() == MDTemplateValueParameterKind; diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp index be1db2233d2d..59e3c0ec8cf8 100644 --- a/llvm/lib/AsmParser/LLParser.cpp +++ b/llvm/lib/AsmParser/LLParser.cpp @@ -3513,12 +3513,41 @@ bool LLParser::ParseMDNamespace(MDNode *&Result, bool IsDistinct) { return false; } +/// ParseMDTemplateTypeParameter: +/// ::= !MDTemplateTypeParameter(scope: !0, name: "Ty", type: !1) bool LLParser::ParseMDTemplateTypeParameter(MDNode *&Result, bool IsDistinct) { - return TokError("unimplemented parser"); +#define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \ + REQUIRED(scope, MDField, ); \ + OPTIONAL(name, MDStringField, ); \ + REQUIRED(type, MDField, ); + PARSE_MD_FIELDS(); +#undef VISIT_MD_FIELDS + + Result = GET_OR_DISTINCT(MDTemplateTypeParameter, + (Context, scope.Val, name.Val, type.Val)); + return false; } + +/// ParseMDTemplateValueParameter: +/// ::= !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, +/// scope: !0, name: "V", type: !1, +/// value: i32 7) bool LLParser::ParseMDTemplateValueParameter(MDNode *&Result, bool IsDistinct) { - return TokError("unimplemented parser"); +#define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \ + REQUIRED(tag, DwarfTagField, ); \ + REQUIRED(scope, MDField, ); \ + OPTIONAL(name, MDStringField, ); \ + REQUIRED(type, MDField, ); \ + REQUIRED(value, MDField, ); + PARSE_MD_FIELDS(); +#undef VISIT_MD_FIELDS + + Result = GET_OR_DISTINCT( + MDTemplateValueParameter, + (Context, tag.Val, scope.Val, name.Val, type.Val, value.Val)); + return false; } + bool LLParser::ParseMDGlobalVariable(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 d0606788d44b..9731e8c0e03a 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1502,6 +1502,29 @@ std::error_code BitcodeReader::ParseMetadata() { NextMDValueNo++); break; } + case bitc::METADATA_TEMPLATE_TYPE: { + if (Record.size() != 4) + return Error("Invalid record"); + + MDValueList.AssignValue( + GET_OR_DISTINCT(MDTemplateTypeParameter, Record[0], + (Context, getMDOrNull(Record[1]), + getMDString(Record[2]), getMDOrNull(Record[3]))), + NextMDValueNo++); + break; + } + case bitc::METADATA_TEMPLATE_VALUE: { + if (Record.size() != 6) + return Error("Invalid record"); + + MDValueList.AssignValue( + GET_OR_DISTINCT(MDTemplateValueParameter, Record[0], + (Context, Record[1], getMDOrNull(Record[2]), + getMDString(Record[3]), getMDOrNull(Record[4]), + getMDOrNull(Record[5]))), + 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 aa774ba38e05..b1b61e717e69 100644 --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -1021,20 +1021,36 @@ static void WriteMDNamespace(const MDNamespace *N, const ValueEnumerator &VE, Record.clear(); } -static void WriteMDTemplateTypeParameter(const MDTemplateTypeParameter *, - const ValueEnumerator &, - BitstreamWriter &, - SmallVectorImpl &, - unsigned) { - llvm_unreachable("write not implemented"); +static void WriteMDTemplateTypeParameter(const MDTemplateTypeParameter *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->getRawName())); + Record.push_back(VE.getMetadataOrNullID(N->getType())); + + Stream.EmitRecord(bitc::METADATA_TEMPLATE_TYPE, Record, Abbrev); + Record.clear(); } -static void WriteMDTemplateValueParameter(const MDTemplateValueParameter *, - const ValueEnumerator &, - BitstreamWriter &, - SmallVectorImpl &, - unsigned) { - llvm_unreachable("write not implemented"); + +static void WriteMDTemplateValueParameter(const MDTemplateValueParameter *N, + const ValueEnumerator &VE, + BitstreamWriter &Stream, + SmallVectorImpl &Record, + unsigned Abbrev) { + Record.push_back(N->isDistinct()); + Record.push_back(N->getTag()); + Record.push_back(VE.getMetadataOrNullID(N->getScope())); + Record.push_back(VE.getMetadataOrNullID(N->getRawName())); + Record.push_back(VE.getMetadataOrNullID(N->getType())); + Record.push_back(VE.getMetadataOrNullID(N->getValue())); + + Stream.EmitRecord(bitc::METADATA_TEMPLATE_VALUE, Record, Abbrev); + Record.clear(); } + static void WriteMDGlobalVariable(const MDGlobalVariable *, const ValueEnumerator &, BitstreamWriter &, SmallVectorImpl &, unsigned) { diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp index 29de2f291d20..4e7bc8ded0cd 100644 --- a/llvm/lib/IR/AsmWriter.cpp +++ b/llvm/lib/IR/AsmWriter.cpp @@ -1678,18 +1678,39 @@ static void writeMDNamespace(raw_ostream &Out, const MDNamespace *N, Out << ")"; } -static void writeMDTemplateTypeParameter(raw_ostream &, - const MDTemplateTypeParameter *, - TypePrinting *, SlotTracker *, - const Module *) { - llvm_unreachable("write not implemented"); +static void writeMDTemplateTypeParameter(raw_ostream &Out, + const MDTemplateTypeParameter *N, + TypePrinting *TypePrinter, + SlotTracker *Machine, + const Module *Context) { + Out << "!MDTemplateTypeParameter("; + FieldSeparator FS; + Out << FS << "scope: "; + writeMetadataAsOperand(Out, N->getScope(), TypePrinter, Machine, Context); + Out << FS << "name: \"" << N->getName() << "\""; + Out << FS << "type: "; + writeMetadataAsOperand(Out, N->getType(), TypePrinter, Machine, Context); + Out << ")"; } -static void writeMDTemplateValueParameter(raw_ostream &, - const MDTemplateValueParameter *, - TypePrinting *, SlotTracker *, - const Module *) { - llvm_unreachable("write not implemented"); + +static void writeMDTemplateValueParameter(raw_ostream &Out, + const MDTemplateValueParameter *N, + TypePrinting *TypePrinter, + SlotTracker *Machine, + const Module *Context) { + Out << "!MDTemplateValueParameter("; + FieldSeparator FS; + writeTag(Out, FS, N); + Out << FS << "scope: "; + writeMetadataAsOperand(Out, N->getScope(), TypePrinter, Machine, Context); + Out << FS << "name: \"" << N->getName() << "\""; + Out << FS << "type: "; + writeMetadataAsOperand(Out, N->getType(), TypePrinter, Machine, Context); + Out << FS << "value: "; + writeMetadataAsOperand(Out, N->getValue(), TypePrinter, Machine, Context); + Out << ")"; } + static void writeMDGlobalVariable(raw_ostream &, const MDGlobalVariable *, TypePrinting *, SlotTracker *, const Module *) { diff --git a/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-parent.ll b/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-parent.ll new file mode 100644 index 000000000000..741506ee0cfe --- /dev/null +++ b/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-parent.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+1]]:40: error: missing required field 'scope' +!0 = !MDTemplateTypeParameter(type: !{}) diff --git a/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll b/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll new file mode 100644 index 000000000000..8fd9bdf58587 --- /dev/null +++ b/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+1]]:41: error: missing required field 'type' +!0 = !MDTemplateTypeParameter(scope: !{}) diff --git a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-parent.ll b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-parent.ll new file mode 100644 index 000000000000..1b9053f757f5 --- /dev/null +++ b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-parent.ll @@ -0,0 +1,5 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+2]]:44: error: missing required field 'scope' +!0 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, type: !{}, + value: i32 7) diff --git a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-tag.ll b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-tag.ll new file mode 100644 index 000000000000..db755c98c605 --- /dev/null +++ b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-tag.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+1]]:67: error: missing required field 'tag' +!0 = !MDTemplateValueParameter(scope: !{}, type: !{}, value: i32 7) diff --git a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-type.ll b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-type.ll new file mode 100644 index 000000000000..2db944ec89ff --- /dev/null +++ b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-type.ll @@ -0,0 +1,5 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+2]]:56: error: missing required field 'type' +!0 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, + scope: !{}, value: i32 7) diff --git a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll new file mode 100644 index 000000000000..8ca04377c68b --- /dev/null +++ b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll @@ -0,0 +1,5 @@ +; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s + +; CHECK: [[@LINE+2]]:53: error: missing required field 'value' +!0 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, + scope: !{}, type: !{}) diff --git a/llvm/test/Assembler/mdtemplateparameter.ll b/llvm/test/Assembler/mdtemplateparameter.ll new file mode 100644 index 000000000000..aef2bfd21b2d --- /dev/null +++ b/llvm/test/Assembler/mdtemplateparameter.ll @@ -0,0 +1,24 @@ +; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s +; RUN: verify-uselistorder %s + +; CHECK: !named = !{!0, !1, !2, !3, !3, !4, !5, !5} +!named = !{!0, !1, !2, !3, !4, !5, !6, !7} + +!0 = distinct !{} +!1 = distinct !{} +; CHECK: !1 = distinct !{} + +; CHECK-NEXT: !2 = !MDTemplateTypeParameter(scope: !0, name: "Ty", type: !1) +; CHECK-NEXT: !3 = !MDTemplateTypeParameter(scope: !0, name: "", type: !1) +!2 = !MDTemplateTypeParameter(scope: !0, name: "Ty", type: !1) +!3 = !MDTemplateTypeParameter(scope: !0, type: !1) +!4 = !MDTemplateTypeParameter(scope: !0, name: "", type: !1) + +; CHECK-NEXT: !4 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, scope: !0, name: "V", type: !1, value: i32 7) +; CHECK-NEXT: !5 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, scope: !0, name: "", type: !1, value: i32 7) +!5 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, + scope: !0, name: "V", type: !1, value: i32 7) +!6 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, + scope: !0, type: !1, value: i32 7) +!7 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, + scope: !0, name: "", type: !1, value: i32 7)