diff --git a/llvm/include/llvm/IR/DebugInfoMetadata.h b/llvm/include/llvm/IR/DebugInfoMetadata.h --- a/llvm/include/llvm/IR/DebugInfoMetadata.h +++ b/llvm/include/llvm/IR/DebugInfoMetadata.h @@ -931,13 +931,14 @@ uint32_t AlignInBits, uint64_t OffsetInBits, DIFlags Flags, DINodeArray Elements, unsigned RuntimeLang, DIType *VTableHolder, DITemplateParameterArray TemplateParams, StringRef Identifier, - DIDerivedType *Discriminator, StorageType Storage, - bool ShouldCreate = true) { - return getImpl( - Context, Tag, getCanonicalMDString(Context, Name), File, Line, Scope, - BaseType, SizeInBits, AlignInBits, OffsetInBits, Flags, Elements.get(), - RuntimeLang, VTableHolder, TemplateParams.get(), - getCanonicalMDString(Context, Identifier), Discriminator, Storage, ShouldCreate); + DIDerivedType *Discriminator, Metadata *DataLocation, + StorageType Storage, bool ShouldCreate = true) { + return getImpl(Context, Tag, getCanonicalMDString(Context, Name), File, + Line, Scope, BaseType, SizeInBits, AlignInBits, OffsetInBits, + Flags, Elements.get(), RuntimeLang, VTableHolder, + TemplateParams.get(), + getCanonicalMDString(Context, Identifier), Discriminator, + DataLocation, Storage, ShouldCreate); } static DICompositeType * getImpl(LLVMContext &Context, unsigned Tag, MDString *Name, Metadata *File, @@ -945,7 +946,7 @@ uint64_t SizeInBits, uint32_t AlignInBits, uint64_t OffsetInBits, DIFlags Flags, Metadata *Elements, unsigned RuntimeLang, Metadata *VTableHolder, Metadata *TemplateParams, - MDString *Identifier, Metadata *Discriminator, + MDString *Identifier, Metadata *Discriminator, Metadata *DataLocation, StorageType Storage, bool ShouldCreate = true); TempDICompositeType cloneImpl() const { @@ -953,34 +954,34 @@ getScope(), getBaseType(), getSizeInBits(), getAlignInBits(), getOffsetInBits(), getFlags(), getElements(), getRuntimeLang(), getVTableHolder(), - getTemplateParams(), getIdentifier(), getDiscriminator()); + getTemplateParams(), getIdentifier(), + getDiscriminator(), getRawDataLocation()); } public: - DEFINE_MDNODE_GET(DICompositeType, - (unsigned Tag, StringRef Name, DIFile *File, unsigned Line, - DIScope *Scope, DIType *BaseType, uint64_t SizeInBits, - uint32_t AlignInBits, uint64_t OffsetInBits, DIFlags Flags, - DINodeArray Elements, unsigned RuntimeLang, - DIType *VTableHolder, - DITemplateParameterArray TemplateParams = nullptr, - StringRef Identifier = "", - DIDerivedType *Discriminator = nullptr), - (Tag, Name, File, Line, Scope, BaseType, SizeInBits, - AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang, - VTableHolder, TemplateParams, Identifier, Discriminator)) - DEFINE_MDNODE_GET(DICompositeType, - (unsigned Tag, MDString *Name, Metadata *File, - unsigned Line, Metadata *Scope, Metadata *BaseType, - uint64_t SizeInBits, uint32_t AlignInBits, - uint64_t OffsetInBits, DIFlags Flags, Metadata *Elements, - unsigned RuntimeLang, Metadata *VTableHolder, - Metadata *TemplateParams = nullptr, - MDString *Identifier = nullptr, - Metadata *Discriminator = nullptr), - (Tag, Name, File, Line, Scope, BaseType, SizeInBits, - AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang, - VTableHolder, TemplateParams, Identifier, Discriminator)) + DEFINE_MDNODE_GET( + DICompositeType, + (unsigned Tag, StringRef Name, DIFile *File, unsigned Line, + DIScope *Scope, DIType *BaseType, uint64_t SizeInBits, + uint32_t AlignInBits, uint64_t OffsetInBits, DIFlags Flags, + DINodeArray Elements, unsigned RuntimeLang, DIType *VTableHolder, + DITemplateParameterArray TemplateParams = nullptr, + StringRef Identifier = "", DIDerivedType *Discriminator = nullptr, + Metadata *DataLocation = nullptr), + (Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits, + OffsetInBits, Flags, Elements, RuntimeLang, VTableHolder, TemplateParams, + Identifier, Discriminator, DataLocation)) + DEFINE_MDNODE_GET( + DICompositeType, + (unsigned Tag, MDString *Name, Metadata *File, unsigned Line, + Metadata *Scope, Metadata *BaseType, uint64_t SizeInBits, + uint32_t AlignInBits, uint64_t OffsetInBits, DIFlags Flags, + Metadata *Elements, unsigned RuntimeLang, Metadata *VTableHolder, + Metadata *TemplateParams = nullptr, MDString *Identifier = nullptr, + Metadata *Discriminator = nullptr, Metadata *DataLocation = nullptr), + (Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits, + OffsetInBits, Flags, Elements, RuntimeLang, VTableHolder, TemplateParams, + Identifier, Discriminator, DataLocation)) TempDICompositeType clone() const { return cloneImpl(); } @@ -997,7 +998,8 @@ Metadata *BaseType, uint64_t SizeInBits, uint32_t AlignInBits, uint64_t OffsetInBits, DIFlags Flags, Metadata *Elements, unsigned RuntimeLang, Metadata *VTableHolder, - Metadata *TemplateParams, Metadata *Discriminator); + Metadata *TemplateParams, Metadata *Discriminator, + Metadata *DataLocation); static DICompositeType *getODRTypeIfExists(LLVMContext &Context, MDString &Identifier); @@ -1016,7 +1018,8 @@ Metadata *BaseType, uint64_t SizeInBits, uint32_t AlignInBits, uint64_t OffsetInBits, DIFlags Flags, Metadata *Elements, unsigned RuntimeLang, Metadata *VTableHolder, - Metadata *TemplateParams, Metadata *Discriminator); + Metadata *TemplateParams, Metadata *Discriminator, + Metadata *DataLocation); DIType *getBaseType() const { return cast_or_null(getRawBaseType()); } DINodeArray getElements() const { @@ -1038,6 +1041,13 @@ MDString *getRawIdentifier() const { return getOperandAs(7); } Metadata *getRawDiscriminator() const { return getOperand(8); } DIDerivedType *getDiscriminator() const { return getOperandAs(8); } + Metadata *getRawDataLocation() const { return getOperand(9); } + DIVariable *getDataLocation() const { + return dyn_cast_or_null(getRawDataLocation()); + } + DIExpression *getDataLocationExp() const { + return dyn_cast_or_null(getRawDataLocation()); + } /// Replace operands. /// diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp --- a/llvm/lib/AsmParser/LLParser.cpp +++ b/llvm/lib/AsmParser/LLParser.cpp @@ -4611,7 +4611,8 @@ OPTIONAL(vtableHolder, MDField, ); \ OPTIONAL(templateParams, MDField, ); \ OPTIONAL(identifier, MDStringField, ); \ - OPTIONAL(discriminator, MDField, ); + OPTIONAL(discriminator, MDField, ); \ + OPTIONAL(dataLocation, MDField, ); PARSE_MD_FIELDS(); #undef VISIT_MD_FIELDS @@ -4620,8 +4621,8 @@ if (auto *CT = DICompositeType::buildODRType( Context, *identifier.Val, tag.Val, name.Val, file.Val, line.Val, scope.Val, baseType.Val, size.Val, align.Val, offset.Val, flags.Val, - elements.Val, runtimeLang.Val, vtableHolder.Val, - templateParams.Val, discriminator.Val)) { + elements.Val, runtimeLang.Val, vtableHolder.Val, templateParams.Val, + discriminator.Val, dataLocation.Val)) { Result = CT; return false; } @@ -4633,7 +4634,7 @@ (Context, tag.Val, name.Val, file.Val, line.Val, scope.Val, baseType.Val, size.Val, align.Val, offset.Val, flags.Val, elements.Val, runtimeLang.Val, vtableHolder.Val, templateParams.Val, identifier.Val, - discriminator.Val)); + discriminator.Val, dataLocation.Val)); return false; } diff --git a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp --- a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp +++ b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp @@ -1340,7 +1340,7 @@ break; } case bitc::METADATA_COMPOSITE_TYPE: { - if (Record.size() < 16 || Record.size() > 17) + if (Record.size() < 16 || Record.size() > 18) return error("Invalid record"); // If we have a UUID and this is not a forward declaration, lookup the @@ -1364,6 +1364,7 @@ Metadata *VTableHolder = nullptr; Metadata *TemplateParams = nullptr; Metadata *Discriminator = nullptr; + Metadata *DataLocation = nullptr; auto *Identifier = getMDString(Record[15]); // If this module is being parsed so that it can be ThinLTO imported // into another module, composite types only need to be imported @@ -1387,12 +1388,15 @@ if (Record.size() > 16) Discriminator = getMDOrNull(Record[16]); } + if (Record.size() > 17) + if (Tag == dwarf::DW_TAG_array_type) + DataLocation = getMDOrNull(Record[17]); DICompositeType *CT = nullptr; if (Identifier) CT = DICompositeType::buildODRType( Context, *Identifier, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang, - VTableHolder, TemplateParams, Discriminator); + VTableHolder, TemplateParams, Discriminator, DataLocation); // Create a node if we didn't get a lazy ODR type. if (!CT) @@ -1400,7 +1404,7 @@ (Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang, VTableHolder, TemplateParams, - Identifier, Discriminator)); + Identifier, Discriminator, DataLocation)); if (!IsNotUsedInTypeRef && Identifier) MetadataList.addTypeRef(*Identifier, *cast(CT)); diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -1625,6 +1625,7 @@ Record.push_back(VE.getMetadataOrNullID(N->getTemplateParams().get())); Record.push_back(VE.getMetadataOrNullID(N->getRawIdentifier())); Record.push_back(VE.getMetadataOrNullID(N->getDiscriminator())); + Record.push_back(VE.getMetadataOrNullID(N->getRawDataLocation())); Stream.EmitRecord(bitc::METADATA_COMPOSITE_TYPE, Record, Abbrev); Record.clear(); diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp --- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp @@ -1409,6 +1409,17 @@ CTy->getSizeInBits() / CHAR_BIT); } + if (DIVariable *Var = CTy->getDataLocation()) { + if (auto *VarDIE = getDIE(Var)) + addDIEEntry(Buffer, dwarf::DW_AT_data_location, *VarDIE); + } else if (DIExpression *Expr = CTy->getDataLocationExp()) { + DIELoc *Loc = new (DIEValueAllocator) DIELoc; + DIEDwarfExpression DwarfExpr(*Asm, getCU(), *Loc); + DwarfExpr.setMemoryLocationKind(); + DwarfExpr.addExpression(Expr); + addBlock(Buffer, dwarf::DW_AT_data_location, DwarfExpr.finalize()); + } + // Emit the element type. addType(Buffer, CTy->getBaseType()); diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp --- a/llvm/lib/IR/AsmWriter.cpp +++ b/llvm/lib/IR/AsmWriter.cpp @@ -1931,6 +1931,7 @@ Printer.printMetadata("templateParams", N->getRawTemplateParams()); Printer.printString("identifier", N->getIdentifier()); Printer.printMetadata("discriminator", N->getRawDiscriminator()); + Printer.printMetadata("dataLocation", N->getRawDataLocation()); Out << ")"; } diff --git a/llvm/lib/IR/DebugInfoMetadata.cpp b/llvm/lib/IR/DebugInfoMetadata.cpp --- a/llvm/lib/IR/DebugInfoMetadata.cpp +++ b/llvm/lib/IR/DebugInfoMetadata.cpp @@ -405,17 +405,18 @@ uint32_t AlignInBits, uint64_t OffsetInBits, DIFlags Flags, Metadata *Elements, unsigned RuntimeLang, Metadata *VTableHolder, Metadata *TemplateParams, MDString *Identifier, Metadata *Discriminator, - StorageType Storage, bool ShouldCreate) { + Metadata *DataLocation, StorageType Storage, bool ShouldCreate) { assert(isCanonical(Name) && "Expected canonical MDString"); // Keep this in sync with buildODRType. - DEFINE_GETIMPL_LOOKUP( - DICompositeType, (Tag, Name, File, Line, Scope, BaseType, SizeInBits, - AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang, - VTableHolder, TemplateParams, Identifier, Discriminator)); - Metadata *Ops[] = {File, Scope, Name, BaseType, - Elements, VTableHolder, TemplateParams, Identifier, - Discriminator}; + DEFINE_GETIMPL_LOOKUP(DICompositeType, + (Tag, Name, File, Line, Scope, BaseType, SizeInBits, + AlignInBits, OffsetInBits, Flags, Elements, + RuntimeLang, VTableHolder, TemplateParams, Identifier, + Discriminator, DataLocation)); + Metadata *Ops[] = {File, Scope, Name, BaseType, + Elements, VTableHolder, TemplateParams, Identifier, + Discriminator, DataLocation}; DEFINE_GETIMPL_STORE(DICompositeType, (Tag, Line, RuntimeLang, SizeInBits, AlignInBits, OffsetInBits, Flags), Ops); @@ -426,7 +427,8 @@ Metadata *File, unsigned Line, Metadata *Scope, Metadata *BaseType, uint64_t SizeInBits, uint32_t AlignInBits, uint64_t OffsetInBits, DIFlags Flags, Metadata *Elements, unsigned RuntimeLang, - Metadata *VTableHolder, Metadata *TemplateParams, Metadata *Discriminator) { + Metadata *VTableHolder, Metadata *TemplateParams, Metadata *Discriminator, + Metadata *DataLocation) { assert(!Identifier.getString().empty() && "Expected valid identifier"); if (!Context.isODRUniquingDebugTypes()) return nullptr; @@ -435,7 +437,8 @@ return CT = DICompositeType::getDistinct( Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang, - VTableHolder, TemplateParams, &Identifier, Discriminator); + VTableHolder, TemplateParams, &Identifier, Discriminator, + DataLocation); // Only mutate CT if it's a forward declaration and the new operands aren't. assert(CT->getRawIdentifier() == &Identifier && "Wrong ODR identifier?"); @@ -445,9 +448,9 @@ // Mutate CT in place. Keep this in sync with getImpl. CT->mutate(Tag, Line, RuntimeLang, SizeInBits, AlignInBits, OffsetInBits, Flags); - Metadata *Ops[] = {File, Scope, Name, BaseType, - Elements, VTableHolder, TemplateParams, &Identifier, - Discriminator}; + Metadata *Ops[] = {File, Scope, Name, BaseType, + Elements, VTableHolder, TemplateParams, &Identifier, + Discriminator, DataLocation}; assert((std::end(Ops) - std::begin(Ops)) == (int)CT->getNumOperands() && "Mismatched number of operands"); for (unsigned I = 0, E = CT->getNumOperands(); I != E; ++I) @@ -461,7 +464,8 @@ Metadata *File, unsigned Line, Metadata *Scope, Metadata *BaseType, uint64_t SizeInBits, uint32_t AlignInBits, uint64_t OffsetInBits, DIFlags Flags, Metadata *Elements, unsigned RuntimeLang, - Metadata *VTableHolder, Metadata *TemplateParams, Metadata *Discriminator) { + Metadata *VTableHolder, Metadata *TemplateParams, Metadata *Discriminator, + Metadata *DataLocation) { assert(!Identifier.getString().empty() && "Expected valid identifier"); if (!Context.isODRUniquingDebugTypes()) return nullptr; @@ -470,7 +474,7 @@ CT = DICompositeType::getDistinct( Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang, VTableHolder, - TemplateParams, &Identifier, Discriminator); + TemplateParams, &Identifier, Discriminator, DataLocation); return CT; } diff --git a/llvm/lib/IR/LLVMContextImpl.h b/llvm/lib/IR/LLVMContextImpl.h --- a/llvm/lib/IR/LLVMContextImpl.h +++ b/llvm/lib/IR/LLVMContextImpl.h @@ -510,19 +510,21 @@ Metadata *TemplateParams; MDString *Identifier; Metadata *Discriminator; + Metadata *DataLocation; MDNodeKeyImpl(unsigned Tag, MDString *Name, Metadata *File, unsigned Line, Metadata *Scope, Metadata *BaseType, uint64_t SizeInBits, uint32_t AlignInBits, uint64_t OffsetInBits, unsigned Flags, Metadata *Elements, unsigned RuntimeLang, Metadata *VTableHolder, Metadata *TemplateParams, - MDString *Identifier, Metadata *Discriminator) + MDString *Identifier, Metadata *Discriminator, + Metadata *DataLocation) : Tag(Tag), Name(Name), File(File), Line(Line), Scope(Scope), BaseType(BaseType), SizeInBits(SizeInBits), OffsetInBits(OffsetInBits), AlignInBits(AlignInBits), Flags(Flags), Elements(Elements), RuntimeLang(RuntimeLang), VTableHolder(VTableHolder), TemplateParams(TemplateParams), Identifier(Identifier), - Discriminator(Discriminator) {} + Discriminator(Discriminator), DataLocation(DataLocation) {} MDNodeKeyImpl(const DICompositeType *N) : Tag(N->getTag()), Name(N->getRawName()), File(N->getRawFile()), Line(N->getLine()), Scope(N->getRawScope()), @@ -532,7 +534,8 @@ RuntimeLang(N->getRuntimeLang()), VTableHolder(N->getRawVTableHolder()), TemplateParams(N->getRawTemplateParams()), Identifier(N->getRawIdentifier()), - Discriminator(N->getRawDiscriminator()) {} + Discriminator(N->getRawDiscriminator()), + DataLocation(N->getRawDataLocation()) {} bool isKeyOf(const DICompositeType *RHS) const { return Tag == RHS->getTag() && Name == RHS->getRawName() && @@ -546,7 +549,8 @@ VTableHolder == RHS->getRawVTableHolder() && TemplateParams == RHS->getRawTemplateParams() && Identifier == RHS->getRawIdentifier() && - Discriminator == RHS->getRawDiscriminator(); + Discriminator == RHS->getRawDiscriminator() && + DataLocation == RHS->getRawDataLocation(); } unsigned getHashValue() const { @@ -555,7 +559,7 @@ // collision "most of the time". There is no correctness issue in case of // collision because of the full check above. return hash_combine(Name, File, Line, BaseType, Scope, Elements, - TemplateParams); + TemplateParams, DataLocation); } }; diff --git a/llvm/test/Bitcode/dataLocation.ll b/llvm/test/Bitcode/dataLocation.ll new file mode 100644 --- /dev/null +++ b/llvm/test/Bitcode/dataLocation.ll @@ -0,0 +1,31 @@ +;; This test checks dataLocation field of DICompositeType + +; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s + +;; Test whether DW_AT_data_location is generated. +; CHECK: !DICompositeType(tag: DW_TAG_array_type, baseType: !{{[0-9]+}}, size: 32, align: 32, elements: !{{[0-9]+}}, dataLocation: !{{[0-9]+}}) +; CHECK: !DICompositeType(tag: DW_TAG_array_type, baseType: !{{[0-9]+}}, size: 32, align: 32, elements: !{{[0-9]+}}, dataLocation: !DIExpression(DW_OP_constu, 3412)) + +; ModuleID = 'dataLocation.f90' +source_filename = "/dir/dataLocation.ll" + +!llvm.module.flags = !{!0, !1} +!llvm.dbg.cu = !{!2} + +!0 = !{i32 2, !"Dwarf Version", i32 4} +!1 = !{i32 2, !"Debug Info Version", i32 3} +!2 = distinct !DICompileUnit(language: DW_LANG_Fortran90, file: !3, producer: " F90 Flang - 1.5 2017-05-01", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, retainedTypes: !5, globals: !4, imports: !4) +!3 = !DIFile(filename: "fortsubrange.f90", directory: "/dir") +!4 = !{} +!5 = !{!6, !16} +!6 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, size: 32, align: 32, elements: !8, dataLocation: !10) +!7 = !DIBasicType(name: "integer", size: 32, align: 32, encoding: DW_ATE_signed) +!8 = !{!9} +!9 = !DISubrange(count: 19, lowerBound: 2) +!10 = distinct !DILocalVariable(scope: !11, file: !3, type: !15, flags: DIFlagArtificial) +!11 = !DILexicalBlock(scope: !12, file: !3, line: 1, column: 1) +!12 = distinct !DISubprogram(name: "main", scope: !2, file: !3, line: 1, type: !13, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagMainSubprogram, unit: !2) +!13 = !DISubroutineType(cc: DW_CC_program, types: !14) +!14 = !{null} +!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 32, align: 32) +!16 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, size: 32, align: 32, elements: !8, dataLocation: !DIExpression(DW_OP_constu, 3412)) diff --git a/llvm/test/DebugInfo/dwarfdump-dataLocationExp.ll b/llvm/test/DebugInfo/dwarfdump-dataLocationExp.ll new file mode 100644 --- /dev/null +++ b/llvm/test/DebugInfo/dwarfdump-dataLocationExp.ll @@ -0,0 +1,183 @@ +;; This test checks DW_AT_data_location attribute + +; RUN: llc %s -O2 -filetype=obj -o %t.o +; RUN: llvm-dwarfdump %t.o | FileCheck %s + +;; Test whether DW_AT_data_location is generated. +; CHECK-LABEL: DW_TAG_array_type + +; CHECK: DW_AT_data_location (DW_OP_constu 0x1a85) +; CHECK: DW_TAG_subrange_type + +;; Test case is hand written with the help of below testcase +;;------------------------------ +;;program main +;;integer, allocatable :: arr(:) +;;allocate(arr(2:20)) +;;arr(2)=99 +;;print *, arr +;;end program main +;;------------------------------ + +; ModuleID = 'fortsubrange.ll' +source_filename = "fortsubrange.ll" +target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +@.C343_MAIN_ = internal constant i32 4 +@.C339_MAIN_ = internal constant i32 6 +@.C336_MAIN_ = internal constant [16 x i8] c"fortsubrange.f90" +@.C338_MAIN_ = internal constant i32 5 +@.C335_MAIN_ = internal constant i32 99 +@.C344_MAIN_ = internal constant i32 25 +@.C351_MAIN_ = internal constant i64 4 +@.C350_MAIN_ = internal constant i64 25 +@.C334_MAIN_ = internal constant i64 21 +@.C332_MAIN_ = internal constant i64 20 +@.C331_MAIN_ = internal constant i64 2 +@.C309_MAIN_ = internal constant i64 1 +@.C307_MAIN_ = internal constant i64 0 +@.C306_MAIN_ = internal constant i32 0 + +define void @MAIN_() !dbg !5 { +L.entry: + %.Z0640_333 = alloca i32*, align 8 + %"arr$sd1_349" = alloca [16 x i64], align 8 + %z_b_0_326 = alloca i64, align 8 + %z_b_1_327 = alloca i64, align 8 + %z_e_17_330 = alloca i64, align 8 + %z_b_2_328 = alloca i64, align 8 + %z_b_3_329 = alloca i64, align 8 + %z__io_341 = alloca i32, align 4 + %.g0000_387 = alloca i64, align 8 + %0 = bitcast i32* @.C306_MAIN_ to i8*, !dbg !8 + %1 = bitcast void (...)* @fort_init to void (i8*, ...)*, !dbg !8 + call void (i8*, ...) %1(i8* %0), !dbg !8 + call void @llvm.dbg.declare(metadata [16 x i64]* %"arr$sd1_349", metadata !10, metadata !DIExpression()), !dbg !17 + %2 = bitcast i32** %.Z0640_333 to i8**, !dbg !8 + store i8* null, i8** %2, align 8, !dbg !8 + call void @llvm.dbg.declare(metadata i32** %.Z0640_333, metadata !15, metadata !DIExpression()), !dbg !17 + %3 = bitcast [16 x i64]* %"arr$sd1_349" to i64*, !dbg !8 + store i64 0, i64* %3, align 8, !dbg !8 + br label %L.LB1_364 + +L.LB1_364: ; preds = %L.entry + store i64 2, i64* %z_b_0_326, align 8, !dbg !18 + store i64 20, i64* %z_b_1_327, align 8, !dbg !18 + %4 = load i64, i64* %z_b_0_326, align 8, !dbg !18 + %5 = sub nsw i64 21, %4, !dbg !18 + store i64 %5, i64* %z_e_17_330, align 8, !dbg !18 + %6 = bitcast [16 x i64]* %"arr$sd1_349" to i8*, !dbg !18 + %7 = bitcast i64* @.C307_MAIN_ to i8*, !dbg !18 + %8 = bitcast i64* @.C350_MAIN_ to i8*, !dbg !18 + %9 = bitcast i64* @.C351_MAIN_ to i8*, !dbg !18 + %10 = bitcast i64* %z_b_0_326 to i8*, !dbg !18 + %11 = bitcast i64* %z_b_1_327 to i8*, !dbg !18 + %12 = bitcast void (...)* @f90_template1_i8 to void (i8*, i8*, i8*, i8*, i8*, i8*, ...)*, !dbg !18 + call void (i8*, i8*, i8*, i8*, i8*, i8*, ...) %12(i8* %6, i8* %7, i8* %8, i8* %9, i8* %10, i8* %11), !dbg !18 + %13 = bitcast [16 x i64]* %"arr$sd1_349" to i8*, !dbg !18 + %14 = bitcast void (...)* @f90_set_intrin_type_i8 to void (i8*, i32, ...)*, !dbg !18 + call void (i8*, i32, ...) %14(i8* %13, i32 25), !dbg !18 + %15 = load i64, i64* %z_b_1_327, align 8, !dbg !18 + %16 = load i64, i64* %z_b_0_326, align 8, !dbg !18 + %17 = sub nsw i64 %16, 1, !dbg !18 + %18 = sub nsw i64 %15, %17, !dbg !18 + store i64 %18, i64* %z_b_2_328, align 8, !dbg !18 + %19 = load i64, i64* %z_b_0_326, align 8, !dbg !18 + store i64 %19, i64* %z_b_3_329, align 8, !dbg !18 + %20 = bitcast i64* %z_b_2_328 to i8*, !dbg !18 + %21 = bitcast i64* @.C350_MAIN_ to i8*, !dbg !18 + %22 = bitcast i64* @.C351_MAIN_ to i8*, !dbg !18 + %23 = bitcast i32** %.Z0640_333 to i8*, !dbg !18 + %24 = bitcast i64* @.C309_MAIN_ to i8*, !dbg !18 + %25 = bitcast i64* @.C307_MAIN_ to i8*, !dbg !18 + %26 = bitcast void (...)* @f90_alloc04_chka_i8 to void (i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i64, ...)*, !dbg !18 + call void (i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i64, ...) %26(i8* %20, i8* %21, i8* %22, i8* null, i8* %23, i8* null, i8* %24, i8* %25, i8* null, i64 0), !dbg !18 + %27 = bitcast [16 x i64]* %"arr$sd1_349" to i8*, !dbg !19 + %28 = getelementptr i8, i8* %27, i64 56, !dbg !19 + %29 = bitcast i8* %28 to i64*, !dbg !19 + %30 = load i64, i64* %29, align 8, !dbg !19 + %31 = load i32*, i32** %.Z0640_333, align 8, !dbg !19 + %32 = bitcast i32* %31 to i8*, !dbg !19 + %33 = getelementptr i8, i8* %32, i64 4, !dbg !19 + %34 = bitcast i8* %33 to i32*, !dbg !19 + %35 = getelementptr i32, i32* %34, i64 %30, !dbg !19 + store i32 99, i32* %35, align 4, !dbg !19 + %36 = bitcast i32* @.C338_MAIN_ to i8*, !dbg !20 + %37 = bitcast [16 x i8]* @.C336_MAIN_ to i8*, !dbg !20 + %38 = bitcast void (...)* @f90io_src_info03a to void (i8*, i8*, i64, ...)*, !dbg !20 + call void (i8*, i8*, i64, ...) %38(i8* %36, i8* %37, i64 16), !dbg !20 + %39 = bitcast i32* @.C339_MAIN_ to i8*, !dbg !20 + %40 = bitcast i32* @.C306_MAIN_ to i8*, !dbg !20 + %41 = bitcast i32* @.C306_MAIN_ to i8*, !dbg !20 + %42 = bitcast i32 (...)* @f90io_print_init to i32 (i8*, i8*, i8*, i8*, ...)*, !dbg !20 + %43 = call i32 (i8*, i8*, i8*, i8*, ...) %42(i8* %39, i8* null, i8* %40, i8* %41), !dbg !20 + store i32 %43, i32* %z__io_341, align 4, !dbg !20 + %44 = load i64, i64* %z_b_1_327, align 8, !dbg !20 + %45 = load i64, i64* %z_b_0_326, align 8, !dbg !20 + %46 = sub nsw i64 %44, %45, !dbg !20 + %47 = add nsw i64 %46, 1, !dbg !20 + store i64 %47, i64* %.g0000_387, align 8, !dbg !20 + %48 = bitcast i32* @.C344_MAIN_ to i8*, !dbg !20 + %49 = bitcast i64* %.g0000_387 to i8*, !dbg !20 + %50 = bitcast i32* @.C343_MAIN_ to i8*, !dbg !20 + %51 = load i32*, i32** %.Z0640_333, align 8, !dbg !20 + %52 = bitcast i32* %51 to i8*, !dbg !20 + %53 = bitcast i32 (...)* @f90io_ldw64_aa to i32 (i8*, i8*, i8*, i8*, ...)*, !dbg !20 + %54 = call i32 (i8*, i8*, i8*, i8*, ...) %53(i8* %48, i8* %49, i8* %50, i8* %52), !dbg !20 + store i32 %54, i32* %z__io_341, align 4, !dbg !20 + %55 = call i32 (...) @f90io_ldw_end(), !dbg !20 + store i32 %55, i32* %z__io_341, align 4, !dbg !20 + ret void, !dbg !21 +} + +declare signext i32 @f90io_ldw_end(...) + +declare signext i32 @f90io_ldw64_aa(...) + +declare signext i32 @f90io_print_init(...) + +declare void @f90io_src_info03a(...) + +declare void @f90_alloc04_chka_i8(...) + +declare void @f90_set_intrin_type_i8(...) + +declare void @f90_template1_i8(...) + +; Function Attrs: nounwind readnone speculatable willreturn +declare void @llvm.dbg.declare(metadata, metadata, metadata) + +declare void @fort_init(...) + +; Function Attrs: nounwind readnone speculatable willreturn +declare void @llvm.dbg.value(metadata, metadata, metadata) + +!llvm.module.flags = !{!0, !1} +!llvm.dbg.cu = !{!2} + +!0 = !{i32 2, !"Dwarf Version", i32 4} +!1 = !{i32 2, !"Debug Info Version", i32 3} +!2 = distinct !DICompileUnit(language: DW_LANG_Fortran90, file: !3, producer: " F90 Flang - 1.5 2017-05-01", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, retainedTypes: !4, globals: !4, imports: !4) +!3 = !DIFile(filename: "fortsubrange.f90", directory: "/dir") +!4 = !{} +!5 = distinct !DISubprogram(name: "main", scope: !2, file: !3, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagMainSubprogram, unit: !2) +!6 = !DISubroutineType(cc: DW_CC_program, types: !7) +!7 = !{null} +!8 = !DILocation(line: 1, column: 1, scope: !9) +!9 = !DILexicalBlock(scope: !5, file: !3, line: 1, column: 1) +!10 = !DILocalVariable(name: "arr", scope: !9, file: !3, type: !11) +;; We intend to use DW_OP_push_object_address, since that is not available yet, +;; we are using meaning less expression +;;!11 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 32, align: 32, elements: !13, dataLocation: !DIExpression(DW_OP_push_object_address, DW_OP_deref)) +!11 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 32, align: 32, elements: !13, dataLocation: !DIExpression(DW_OP_constu, 6789)) +!12 = !DIBasicType(name: "integer", size: 32, align: 32, encoding: DW_ATE_signed) +!13 = !{!14} +!14 = !DISubrange(lowerBound: 2, count: 19) +!15 = distinct !DILocalVariable(scope: !9, file: !3, type: !16, flags: DIFlagArtificial) +!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 32, align: 32) +!17 = !DILocation(line: 0, scope: !9) +!18 = !DILocation(line: 3, column: 1, scope: !9) +!19 = !DILocation(line: 4, column: 1, scope: !9) +!20 = !DILocation(line: 5, column: 1, scope: !9) +!21 = !DILocation(line: 6, column: 1, scope: !9) diff --git a/llvm/test/DebugInfo/dwarfdump-dataLocationVar.ll b/llvm/test/DebugInfo/dwarfdump-dataLocationVar.ll new file mode 100644 --- /dev/null +++ b/llvm/test/DebugInfo/dwarfdump-dataLocationVar.ll @@ -0,0 +1,179 @@ +;; This test checks DW_AT_data_location attribute + +; RUN: llc %s -O2 -filetype=obj -o %t.o +; RUN: llvm-dwarfdump %t.o | FileCheck %s + +;; Test whether DW_AT_data_location is generated. +; CHECK-LABEL: DW_TAG_array_type +; CHECK: DW_AT_data_location +; CHECK: DW_TAG_subrange_type + +;; Test case is hand written with the help of below testcase +;;------------------------------ +;;program main +;;integer, allocatable :: arr(:) +;;allocate(arr(2:20)) +;;arr(2)=99 +;;print *, arr +;;end program main +;;------------------------------ + +; ModuleID = 'fortsubrange.ll' +source_filename = "fortsubrange.ll" +target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +@.C343_MAIN_ = internal constant i32 4 +@.C339_MAIN_ = internal constant i32 6 +@.C336_MAIN_ = internal constant [16 x i8] c"fortsubrange.f90" +@.C338_MAIN_ = internal constant i32 5 +@.C335_MAIN_ = internal constant i32 99 +@.C344_MAIN_ = internal constant i32 25 +@.C351_MAIN_ = internal constant i64 4 +@.C350_MAIN_ = internal constant i64 25 +@.C334_MAIN_ = internal constant i64 21 +@.C332_MAIN_ = internal constant i64 20 +@.C331_MAIN_ = internal constant i64 2 +@.C309_MAIN_ = internal constant i64 1 +@.C307_MAIN_ = internal constant i64 0 +@.C306_MAIN_ = internal constant i32 0 + +define void @MAIN_() !dbg !5 { +L.entry: + %.Z0640_333 = alloca i32*, align 8 + %"arr$sd1_349" = alloca [16 x i64], align 8 + %z_b_0_326 = alloca i64, align 8 + %z_b_1_327 = alloca i64, align 8 + %z_e_17_330 = alloca i64, align 8 + %z_b_2_328 = alloca i64, align 8 + %z_b_3_329 = alloca i64, align 8 + %z__io_341 = alloca i32, align 4 + %.g0000_387 = alloca i64, align 8 + %0 = bitcast i32* @.C306_MAIN_ to i8*, !dbg !8 + %1 = bitcast void (...)* @fort_init to void (i8*, ...)*, !dbg !8 + call void (i8*, ...) %1(i8* %0), !dbg !8 + call void @llvm.dbg.declare(metadata [16 x i64]* %"arr$sd1_349", metadata !10, metadata !DIExpression()), !dbg !17 + %2 = bitcast i32** %.Z0640_333 to i8**, !dbg !8 + store i8* null, i8** %2, align 8, !dbg !8 + call void @llvm.dbg.declare(metadata i32** %.Z0640_333, metadata !15, metadata !DIExpression()), !dbg !17 + %3 = bitcast [16 x i64]* %"arr$sd1_349" to i64*, !dbg !8 + store i64 0, i64* %3, align 8, !dbg !8 + br label %L.LB1_364 + +L.LB1_364: ; preds = %L.entry + store i64 2, i64* %z_b_0_326, align 8, !dbg !18 + store i64 20, i64* %z_b_1_327, align 8, !dbg !18 + %4 = load i64, i64* %z_b_0_326, align 8, !dbg !18 + %5 = sub nsw i64 21, %4, !dbg !18 + store i64 %5, i64* %z_e_17_330, align 8, !dbg !18 + %6 = bitcast [16 x i64]* %"arr$sd1_349" to i8*, !dbg !18 + %7 = bitcast i64* @.C307_MAIN_ to i8*, !dbg !18 + %8 = bitcast i64* @.C350_MAIN_ to i8*, !dbg !18 + %9 = bitcast i64* @.C351_MAIN_ to i8*, !dbg !18 + %10 = bitcast i64* %z_b_0_326 to i8*, !dbg !18 + %11 = bitcast i64* %z_b_1_327 to i8*, !dbg !18 + %12 = bitcast void (...)* @f90_template1_i8 to void (i8*, i8*, i8*, i8*, i8*, i8*, ...)*, !dbg !18 + call void (i8*, i8*, i8*, i8*, i8*, i8*, ...) %12(i8* %6, i8* %7, i8* %8, i8* %9, i8* %10, i8* %11), !dbg !18 + %13 = bitcast [16 x i64]* %"arr$sd1_349" to i8*, !dbg !18 + %14 = bitcast void (...)* @f90_set_intrin_type_i8 to void (i8*, i32, ...)*, !dbg !18 + call void (i8*, i32, ...) %14(i8* %13, i32 25), !dbg !18 + %15 = load i64, i64* %z_b_1_327, align 8, !dbg !18 + %16 = load i64, i64* %z_b_0_326, align 8, !dbg !18 + %17 = sub nsw i64 %16, 1, !dbg !18 + %18 = sub nsw i64 %15, %17, !dbg !18 + store i64 %18, i64* %z_b_2_328, align 8, !dbg !18 + %19 = load i64, i64* %z_b_0_326, align 8, !dbg !18 + store i64 %19, i64* %z_b_3_329, align 8, !dbg !18 + %20 = bitcast i64* %z_b_2_328 to i8*, !dbg !18 + %21 = bitcast i64* @.C350_MAIN_ to i8*, !dbg !18 + %22 = bitcast i64* @.C351_MAIN_ to i8*, !dbg !18 + %23 = bitcast i32** %.Z0640_333 to i8*, !dbg !18 + %24 = bitcast i64* @.C309_MAIN_ to i8*, !dbg !18 + %25 = bitcast i64* @.C307_MAIN_ to i8*, !dbg !18 + %26 = bitcast void (...)* @f90_alloc04_chka_i8 to void (i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i64, ...)*, !dbg !18 + call void (i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i64, ...) %26(i8* %20, i8* %21, i8* %22, i8* null, i8* %23, i8* null, i8* %24, i8* %25, i8* null, i64 0), !dbg !18 + %27 = bitcast [16 x i64]* %"arr$sd1_349" to i8*, !dbg !19 + %28 = getelementptr i8, i8* %27, i64 56, !dbg !19 + %29 = bitcast i8* %28 to i64*, !dbg !19 + %30 = load i64, i64* %29, align 8, !dbg !19 + %31 = load i32*, i32** %.Z0640_333, align 8, !dbg !19 + %32 = bitcast i32* %31 to i8*, !dbg !19 + %33 = getelementptr i8, i8* %32, i64 4, !dbg !19 + %34 = bitcast i8* %33 to i32*, !dbg !19 + %35 = getelementptr i32, i32* %34, i64 %30, !dbg !19 + store i32 99, i32* %35, align 4, !dbg !19 + %36 = bitcast i32* @.C338_MAIN_ to i8*, !dbg !20 + %37 = bitcast [16 x i8]* @.C336_MAIN_ to i8*, !dbg !20 + %38 = bitcast void (...)* @f90io_src_info03a to void (i8*, i8*, i64, ...)*, !dbg !20 + call void (i8*, i8*, i64, ...) %38(i8* %36, i8* %37, i64 16), !dbg !20 + %39 = bitcast i32* @.C339_MAIN_ to i8*, !dbg !20 + %40 = bitcast i32* @.C306_MAIN_ to i8*, !dbg !20 + %41 = bitcast i32* @.C306_MAIN_ to i8*, !dbg !20 + %42 = bitcast i32 (...)* @f90io_print_init to i32 (i8*, i8*, i8*, i8*, ...)*, !dbg !20 + %43 = call i32 (i8*, i8*, i8*, i8*, ...) %42(i8* %39, i8* null, i8* %40, i8* %41), !dbg !20 + store i32 %43, i32* %z__io_341, align 4, !dbg !20 + %44 = load i64, i64* %z_b_1_327, align 8, !dbg !20 + %45 = load i64, i64* %z_b_0_326, align 8, !dbg !20 + %46 = sub nsw i64 %44, %45, !dbg !20 + %47 = add nsw i64 %46, 1, !dbg !20 + store i64 %47, i64* %.g0000_387, align 8, !dbg !20 + %48 = bitcast i32* @.C344_MAIN_ to i8*, !dbg !20 + %49 = bitcast i64* %.g0000_387 to i8*, !dbg !20 + %50 = bitcast i32* @.C343_MAIN_ to i8*, !dbg !20 + %51 = load i32*, i32** %.Z0640_333, align 8, !dbg !20 + %52 = bitcast i32* %51 to i8*, !dbg !20 + %53 = bitcast i32 (...)* @f90io_ldw64_aa to i32 (i8*, i8*, i8*, i8*, ...)*, !dbg !20 + %54 = call i32 (i8*, i8*, i8*, i8*, ...) %53(i8* %48, i8* %49, i8* %50, i8* %52), !dbg !20 + store i32 %54, i32* %z__io_341, align 4, !dbg !20 + %55 = call i32 (...) @f90io_ldw_end(), !dbg !20 + store i32 %55, i32* %z__io_341, align 4, !dbg !20 + ret void, !dbg !21 +} + +declare signext i32 @f90io_ldw_end(...) + +declare signext i32 @f90io_ldw64_aa(...) + +declare signext i32 @f90io_print_init(...) + +declare void @f90io_src_info03a(...) + +declare void @f90_alloc04_chka_i8(...) + +declare void @f90_set_intrin_type_i8(...) + +declare void @f90_template1_i8(...) + +; Function Attrs: nounwind readnone speculatable willreturn +declare void @llvm.dbg.declare(metadata, metadata, metadata) + +declare void @fort_init(...) + +; Function Attrs: nounwind readnone speculatable willreturn +declare void @llvm.dbg.value(metadata, metadata, metadata) + +!llvm.module.flags = !{!0, !1} +!llvm.dbg.cu = !{!2} + +!0 = !{i32 2, !"Dwarf Version", i32 4} +!1 = !{i32 2, !"Debug Info Version", i32 3} +!2 = distinct !DICompileUnit(language: DW_LANG_Fortran90, file: !3, producer: " F90 Flang - 1.5 2017-05-01", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, retainedTypes: !4, globals: !4, imports: !4) +!3 = !DIFile(filename: "fortsubrange.f90", directory: "/dir") +!4 = !{} +!5 = distinct !DISubprogram(name: "main", scope: !2, file: !3, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagMainSubprogram, unit: !2) +!6 = !DISubroutineType(cc: DW_CC_program, types: !7) +!7 = !{null} +!8 = !DILocation(line: 1, column: 1, scope: !9) +!9 = !DILexicalBlock(scope: !5, file: !3, line: 1, column: 1) +!10 = !DILocalVariable(name: "arr", scope: !9, file: !3, type: !11) +!11 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 32, align: 32, elements: !13, dataLocation: !15) +!12 = !DIBasicType(name: "integer", size: 32, align: 32, encoding: DW_ATE_signed) +!13 = !{!14} +!14 = !DISubrange(lowerBound: 2, count: 19) +!15 = distinct !DILocalVariable(scope: !9, file: !3, type: !16, flags: DIFlagArtificial) +!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 32, align: 32) +!17 = !DILocation(line: 0, scope: !9) +!18 = !DILocation(line: 3, column: 1, scope: !9) +!19 = !DILocation(line: 4, column: 1, scope: !9) +!20 = !DILocation(line: 5, column: 1, scope: !9) +!21 = !DILocation(line: 6, column: 1, scope: !9) diff --git a/llvm/unittests/IR/DebugTypeODRUniquingTest.cpp b/llvm/unittests/IR/DebugTypeODRUniquingTest.cpp --- a/llvm/unittests/IR/DebugTypeODRUniquingTest.cpp +++ b/llvm/unittests/IR/DebugTypeODRUniquingTest.cpp @@ -29,7 +29,8 @@ // Without a type map, this should return null. EXPECT_FALSE(DICompositeType::getODRType( Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0, nullptr, - nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0, nullptr, nullptr, nullptr)); + nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0, nullptr, nullptr, nullptr, + nullptr)); // Enable the mapping. There still shouldn't be a type. Context.enableDebugTypeODRUniquing(); @@ -38,7 +39,8 @@ // Create some ODR-uniqued type. auto &CT = *DICompositeType::getODRType( Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0, nullptr, - nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0, nullptr, nullptr, nullptr); + nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0, nullptr, nullptr, nullptr, + nullptr); EXPECT_EQ(UUID.getString(), CT.getIdentifier()); // Check that we get it back, even if we change a field. @@ -46,12 +48,12 @@ EXPECT_EQ(&CT, DICompositeType::getODRType( Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0, nullptr, nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0, + nullptr, nullptr, nullptr, nullptr)); + EXPECT_EQ(&CT, DICompositeType::getODRType( + Context, UUID, dwarf::DW_TAG_class_type, + MDString::get(Context, "name"), nullptr, 0, nullptr, + nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0, nullptr, nullptr, nullptr, nullptr)); - EXPECT_EQ(&CT, - DICompositeType::getODRType( - Context, UUID, dwarf::DW_TAG_class_type, - MDString::get(Context, "name"), nullptr, 0, nullptr, nullptr, 0, - 0, 0, DINode::FlagZero, nullptr, 0, nullptr, nullptr, nullptr)); // Check that it's discarded with the type map. Context.disableDebugTypeODRUniquing(); @@ -70,32 +72,35 @@ MDString &UUID = *MDString::get(Context, "Type"); auto &CT = *DICompositeType::buildODRType( Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0, nullptr, - nullptr, 0, 0, 0, DINode::FlagFwdDecl, nullptr, 0, nullptr, nullptr, nullptr); + nullptr, 0, 0, 0, DINode::FlagFwdDecl, nullptr, 0, nullptr, nullptr, + nullptr, nullptr); EXPECT_EQ(&CT, DICompositeType::getODRTypeIfExists(Context, UUID)); EXPECT_EQ(dwarf::DW_TAG_class_type, CT.getTag()); // Update with another forward decl. This should be a no-op. EXPECT_EQ(&CT, DICompositeType::buildODRType( - Context, UUID, dwarf::DW_TAG_structure_type, nullptr, nullptr, 0, nullptr, - nullptr, 0, 0, 0, DINode::FlagFwdDecl, nullptr, 0, nullptr, nullptr, nullptr)); + Context, UUID, dwarf::DW_TAG_structure_type, nullptr, + nullptr, 0, nullptr, nullptr, 0, 0, 0, DINode::FlagFwdDecl, + nullptr, 0, nullptr, nullptr, nullptr, nullptr)); EXPECT_EQ(dwarf::DW_TAG_class_type, CT.getTag()); // Update with a definition. This time we should see a change. EXPECT_EQ(&CT, DICompositeType::buildODRType( Context, UUID, dwarf::DW_TAG_structure_type, nullptr, nullptr, 0, nullptr, nullptr, 0, 0, 0, DINode::FlagZero, - nullptr, 0, nullptr, nullptr, nullptr)); + nullptr, 0, nullptr, nullptr, nullptr, nullptr)); EXPECT_EQ(dwarf::DW_TAG_structure_type, CT.getTag()); // Further updates should be ignored. EXPECT_EQ(&CT, DICompositeType::buildODRType( - Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0, nullptr, - nullptr, 0, 0, 0, DINode::FlagFwdDecl, nullptr, 0, nullptr, nullptr, nullptr)); + Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, + 0, nullptr, nullptr, 0, 0, 0, DINode::FlagFwdDecl, nullptr, + 0, nullptr, nullptr, nullptr, nullptr)); EXPECT_EQ(dwarf::DW_TAG_structure_type, CT.getTag()); EXPECT_EQ(&CT, DICompositeType::buildODRType( Context, UUID, dwarf::DW_TAG_class_type, nullptr, nullptr, 0, nullptr, nullptr, 0, 0, 0, DINode::FlagZero, nullptr, 0, - nullptr, nullptr, nullptr)); + nullptr, nullptr, nullptr, nullptr)); EXPECT_EQ(dwarf::DW_TAG_structure_type, CT.getTag()); } @@ -107,7 +112,7 @@ MDString &UUID = *MDString::get(Context, "UUID"); auto &CT = *DICompositeType::buildODRType( Context, UUID, 0, nullptr, nullptr, 0, nullptr, nullptr, 0, 0, 0, - DINode::FlagFwdDecl, nullptr, 0, nullptr, nullptr, nullptr); + DINode::FlagFwdDecl, nullptr, 0, nullptr, nullptr, nullptr, nullptr); // Create macros for running through all the fields except Identifier and Flags. #define FOR_EACH_MDFIELD() \ @@ -136,11 +141,11 @@ #undef DO_FOR_FIELD // Replace all the fields with new values that are distinct from each other. - EXPECT_EQ(&CT, - DICompositeType::buildODRType( - Context, UUID, Tag, Name, File, Line, Scope, BaseType, - SizeInBits, AlignInBits, OffsetInBits, DINode::FlagArtificial, - Elements, RuntimeLang, VTableHolder, TemplateParams, nullptr)); + EXPECT_EQ(&CT, DICompositeType::buildODRType( + Context, UUID, Tag, Name, File, Line, Scope, BaseType, + SizeInBits, AlignInBits, OffsetInBits, + DINode::FlagArtificial, Elements, RuntimeLang, + VTableHolder, TemplateParams, nullptr, nullptr)); // Confirm that all the right fields got updated. #define DO_FOR_FIELD(X) EXPECT_EQ(X, CT.getRaw##X());