Index: include/llvm/CodeGen/SelectionDAG.h =================================================================== --- include/llvm/CodeGen/SelectionDAG.h +++ include/llvm/CodeGen/SelectionDAG.h @@ -21,6 +21,7 @@ #include "llvm/ADT/ilist.h" #include "llvm/CodeGen/DAGCombine.h" #include "llvm/CodeGen/SelectionDAGNodes.h" +#include "llvm/IR/DebugInfo.h" #include "llvm/Support/RecyclingAllocator.h" #include "llvm/Target/TargetMachine.h" #include @@ -205,6 +206,9 @@ /// DbgInfo - Tracks dbg_value information through SDISel. SDDbgInfo *DbgInfo; + /// Holds the map for resolving DITypes in the current module. + DITypeIdentifierMapCache TypeIdentifierMapCache; + public: /// DAGUpdateListener - Clients of various APIs that cause global effects on /// the DAG can optionally implement this interface. This allows the clients @@ -280,6 +284,9 @@ const TargetSelectionDAGInfo &getSelectionDAGInfo() const { return TSI; } LLVMContext *getContext() const {return Context; } + /// Return the DITypeIdentifierMap for the current module. + const DITypeIdentifierMap& getTypeIdentifierMap(); + /// viewGraph - Pop up a GraphViz/gv window with the DAG rendered using 'dot'. /// void viewGraph(const std::string &Title); Index: include/llvm/IR/DebugInfo.h =================================================================== --- include/llvm/IR/DebugInfo.h +++ include/llvm/IR/DebugInfo.h @@ -859,6 +859,17 @@ /// Construct DITypeIdentifierMap by going through retained types of each CU. DITypeIdentifierMap generateDITypeIdentifierMap(const NamedMDNode *CU_Nodes); +/// \brief Caches the last Module for which a DITypeIdentifierMap was +/// constructed. +class DITypeIdentifierMapCache { + DITypeIdentifierMap Map; + const Module *LastModule; +public: + DITypeIdentifierMapCache() : LastModule(0) {} + /// \brief Return the DITypeIdentifierMap for the module M. + const DITypeIdentifierMap& get(const Module *M); +}; + /// Strip debug info in the module if it exists. /// To do this, we remove all calls to the debugger intrinsics and any named /// metadata for debugging. We also remove debug locations for instructions. Index: lib/CodeGen/AsmPrinter/DwarfDebug.cpp =================================================================== --- lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -1277,10 +1277,16 @@ Loc.addValue(Range.second); DebugLoc.push_back(std::move(Loc)); } + // Add this value to the list of open ranges. if (DIVar.isVariablePiece()) OpenRanges.push_back({DIVar, Value}); +// // Attempt to merge the last two entries. +// auto LastLoc = DebugLoc.rbegin(); +// if (DebugLoc.size() > 1 && std::next(LastLoc)->Merge(*LastLoc)) +// DebugLoc.pop_back(); + DEBUG(dbgs() << "Values:\n"; for (auto Value : DebugLoc.back().getValues()) Value.getVariable()->dump(); Index: lib/CodeGen/SelectionDAG/InstrEmitter.cpp =================================================================== --- lib/CodeGen/SelectionDAG/InstrEmitter.cpp +++ lib/CodeGen/SelectionDAG/InstrEmitter.cpp @@ -670,6 +670,8 @@ DenseMap::iterator I = VRBaseMap.find(Op); if (I==VRBaseMap.end()) MIB.addReg(0U); // undef + else if (TargetRegisterInfo::isPhysicalRegister(I->second)) + MIB.addReg(I->second, RegState::Debug); else AddOperand(MIB, Op, (*MIB).getNumOperands(), &II, VRBaseMap, /*IsDebug=*/true, /*IsClone=*/false, /*IsCloned=*/false); Index: lib/CodeGen/SelectionDAG/LegalizeTypes.cpp =================================================================== --- lib/CodeGen/SelectionDAG/LegalizeTypes.cpp +++ lib/CodeGen/SelectionDAG/LegalizeTypes.cpp @@ -14,8 +14,12 @@ //===----------------------------------------------------------------------===// #include "LegalizeTypes.h" +#include "SDNodeDbgValue.h" #include "llvm/ADT/SetVector.h" +#include "llvm/CodeGen/MachineFunction.h" +#include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/IR/CallingConv.h" +#include "llvm/IR/DIBuilder.h" #include "llvm/IR/DataLayout.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/ErrorHandling.h" @@ -777,6 +781,42 @@ Hi = Entry.second; } +/// TransferDbgValues - Transfer SDDbgValues. +static void TransferDbgValues(SelectionDAG &DAG, DIBuilder &DIB, + const DITypeIdentifierMap &TypeIdentifierMap, + SDValue From, SDValue To, + unsigned OffsetInBits) { + SDNode *FromNode = From.getNode(); + SDNode *ToNode = To.getNode(); + assert(FromNode != ToNode); + ArrayRef DVs = DAG.GetDbgValues(FromNode); + for (ArrayRef::iterator I = DVs.begin(), E = DVs.end(); + I != E; ++I) { + SDDbgValue *Dbg = *I; + + if (Dbg->getKind() == SDDbgValue::SDNODE) { + // Assuming 8 bits / byte. + DIVariable Var(Dbg->getMDPtr()); + + unsigned VarSize = Var.getSizeInBits(TypeIdentifierMap); + unsigned PieceSizeInBits = To.getValueSizeInBits(); + assert(OffsetInBits % 8 == 0); + assert(PieceSizeInBits % 8 == 0); + assert(PieceSizeInBits+OffsetInBits <= VarSize + && "Piece is larger than or outside of variable"); + DIVariable Piece = (PieceSizeInBits == VarSize) + ? Var + : DIB.createVariablePiece(Var, OffsetInBits/8, PieceSizeInBits/8); + SDDbgValue *Clone = DAG.getDbgValue(&*Piece, ToNode, To.getResNo(), + Dbg->isIndirect(), + Dbg->getOffset(), Dbg->getDebugLoc(), + Dbg->getOrder()); + Dbg->setIsInvalidated(); + DAG.AddDbgValue(Clone, ToNode, false); + } + } +} + void DAGTypeLegalizer::SetExpandedInteger(SDValue Op, SDValue Lo, SDValue Hi) { assert(Lo.getValueType() == @@ -787,6 +827,13 @@ AnalyzeNewValue(Lo); AnalyzeNewValue(Hi); + // Transfer debug values. + const Module *M = DAG.getMachineFunction().getMMI().getModule(); + const DITypeIdentifierMap &Map = DAG.getTypeIdentifierMap(); + DIBuilder DIB(*const_cast(M)); + TransferDbgValues(DAG, DIB, Map, Op, Lo, 0); + TransferDbgValues(DAG, DIB, Map, Op, Hi, Lo.getValueSizeInBits()); + // Remember that this is the result of the node. std::pair &Entry = ExpandedIntegers[Op]; assert(!Entry.first.getNode() && "Node already expanded"); Index: lib/CodeGen/SelectionDAG/SelectionDAG.cpp =================================================================== --- lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -585,6 +585,11 @@ // SelectionDAG Class //===----------------------------------------------------------------------===// +/// Return the DITypeIdentifierMap for the current module. +const DITypeIdentifierMap& SelectionDAG::getTypeIdentifierMap() { + return TypeIdentifierMapCache.get(MF->getMMI().getModule()); +} + /// doNotCSE - Return true if CSE should not be performed for this node. static bool doNotCSE(SDNode *N) { if (N->getValueType(0) == MVT::Glue) @@ -6176,7 +6181,7 @@ I != E; ++I) { SDDbgValue *Dbg = *I; if (Dbg->getKind() == SDDbgValue::SDNODE) { - SDDbgValue *Clone = getDbgValue(Dbg->getMDPtr(), ToNode, To.getResNo(), + SDDbgValue *Clone = getDbgValue(Dbg->getMDPtr(), ToNode, Dbg->getResNo(), Dbg->isIndirect(), Dbg->getOffset(), Dbg->getDebugLoc(), Dbg->getOrder()); Index: lib/IR/DebugInfo.cpp =================================================================== --- lib/IR/DebugInfo.cpp +++ lib/IR/DebugInfo.cpp @@ -948,6 +948,17 @@ return DIVariable(MDNode::get(DV->getContext(), Elts)); } +/// \brief Return the DITypeIdentifierMap for the module M. +const DITypeIdentifierMap& DITypeIdentifierMapCache::get(const Module *M) { + // Update the type identifier map. + if (M != LastModule) { + if (NamedMDNode *CU_Nodes = M->getNamedMetadata("llvm.dbg.cu")) + Map = generateDITypeIdentifierMap(CU_Nodes); + LastModule = M; + } + return Map; +} + /// getDISubprogram - Find subprogram that is enclosing this scope. DISubprogram llvm::getDISubprogram(const MDNode *Scope) { DIDescriptor D(Scope); Index: lib/Transforms/Scalar/SROA.cpp =================================================================== --- lib/Transforms/Scalar/SROA.cpp +++ lib/Transforms/Scalar/SROA.cpp @@ -967,6 +967,15 @@ /// currently in the promotable queue. SetVector > SpeculatableSelects; + /// Debug intrinsics do not show up like regular uses in the + /// IR. This side-table holds the missing use edges. + DenseMap DbgDeclares; + + /// Holds a map from DITypeRef to the actual MDNode. + DITypeIdentifierMapCache TypeIdentifierMapCache; + const DITypeIdentifierMap *TypeIdentifierMap; + + public: SROA(bool RequiresDomTree = true) : FunctionPass(ID), RequiresDomTree(RequiresDomTree), @@ -2042,6 +2051,10 @@ // the insertion point is set to point to the user. IRBuilderTy IRB; + DenseMap& DbgDeclares; + const DITypeIdentifierMap& TypeIdentifierMap; + DIBuilder DIB; + public: AllocaSliceRewriter(const DataLayout &DL, AllocaSlices &S, SROA &Pass, AllocaInst &OldAI, AllocaInst &NewAI, @@ -2049,7 +2062,9 @@ uint64_t NewAllocaEndOffset, bool IsVectorPromotable, bool IsIntegerPromotable, SmallPtrSetImpl &PHIUsers, - SmallPtrSetImpl &SelectUsers) + SmallPtrSetImpl &SelectUsers, + DenseMap& DbgDeclares, + const DITypeIdentifierMap& TypeIdentifierMap) : DL(DL), S(S), Pass(Pass), OldAI(OldAI), NewAI(NewAI), NewAllocaBeginOffset(NewAllocaBeginOffset), NewAllocaEndOffset(NewAllocaEndOffset), @@ -2064,7 +2079,10 @@ : nullptr), BeginOffset(), EndOffset(), IsSplittable(), IsSplit(), OldUse(), OldPtr(), PHIUsers(PHIUsers), SelectUsers(SelectUsers), - IRB(NewAI.getContext(), ConstantFolder()) { + IRB(NewAI.getContext(), ConstantFolder()), + DbgDeclares(DbgDeclares), + TypeIdentifierMap(TypeIdentifierMap), + DIB(*NewAI.getParent()->getParent()->getParent()) { if (VecTy) { assert((DL.getTypeSizeInBits(ElementTy) % 8) == 0 && "Only multiple-of-8 sized vector elements are viable"); @@ -2098,6 +2116,27 @@ IRB.SetCurrentDebugLocation(OldUserI->getDebugLoc()); IRB.SetNamePrefix(Twine(NewAI.getName()) + "." + Twine(BeginOffset) + "."); + // Migrate debug information from the old alloca to the new alloca + // and the individial slices. + if (DbgDeclareInst *DbgDecl = DbgDeclares.lookup(&OldAI)) { + DIVariable Var(DbgDecl->getVariable()); + // If the new slice is smaller than the entire variable (this + // may happen even if this slice is not a split), create + // a variable piece to describe the alloca. This works fine + // even if Var already was a piece. + unsigned ByteSize = 8; + unsigned VarSize = Var.getSizeInBits(TypeIdentifierMap) / ByteSize; + assert(BeginOffset+SliceSize <= VarSize && + "slice is larger than or outside of variable"); + DIVariable Piece = (SliceSize == VarSize) + ? Var + : DIB.createVariablePiece(Var, BeginOffset, SliceSize); + Instruction *NewDDI = DIB.insertDeclare(&NewAI, Piece, OldPtr); + NewDDI->setDebugLoc(DbgDecl->getDebugLoc()); + DbgDeclares.insert(std::make_pair(&NewAI, cast(NewDDI))); + Pass.DeadInsts.insert(DbgDecl); + } + CanSROA &= visit(cast(OldUse->getUser())); if (VecTy || IntTy) assert(CanSROA); @@ -3185,7 +3224,8 @@ AllocaSliceRewriter Rewriter(*DL, S, *this, AI, *NewAI, BeginOffset, EndOffset, IsVectorPromotable, - IsIntegerPromotable, PHIUsers, SelectUsers); + IsIntegerPromotable, PHIUsers, SelectUsers, + DbgDeclares, *TypeIdentifierMap); bool Promotable = true; for (ArrayRef::const_iterator SUI = SplitUses.begin(), SUE = SplitUses.end(); @@ -3620,6 +3660,10 @@ DEBUG(dbgs() << " Skipping SROA -- no target data!\n"); return false; } + + // Update the type identifier map. + TypeIdentifierMap = &TypeIdentifierMapCache.get(F.getParent()); + DL = &DLP->getDataLayout(); DominatorTreeWrapperPass *DTWP = getAnalysisIfAvailable(); @@ -3627,9 +3671,12 @@ BasicBlock &EntryBB = F.getEntryBlock(); for (BasicBlock::iterator I = EntryBB.begin(), E = std::prev(EntryBB.end()); - I != E; ++I) + I != E; ++I) { if (AllocaInst *AI = dyn_cast(I)) Worklist.insert(AI); + else if (DbgDeclareInst *DDI = dyn_cast(I)) + DbgDeclares.insert({DDI->getAddress(), DDI}); + } bool Changed = false; // A set of deleted alloca instruction pointers which should be removed from Index: test/DebugInfo/X86/sdagsplit-1.ll =================================================================== --- /dev/null +++ test/DebugInfo/X86/sdagsplit-1.ll @@ -0,0 +1,71 @@ +; RUN: llc %s -filetype=obj -o %t.o +; RUN: llvm-dwarfdump %t.o | FileCheck --check-prefix=CHECK-DWARF %s +; +; rdar://problem/15928306 +; +; Test that we can emit debug info for large values that are split +; up across multiple registers by the SelectionDAG type legalizer. +; +; // Compile with -O1 -m32. +; long long foo (long long a, long long b, long long c) +; { +; long long res = c+1; +; if ( a == b ) +; return res; +; return 0; +; } +target datalayout = "e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128" +target triple = "i386-apple-macosx10.9.0" + +; CHECK-DWARF: DW_AT_location [DW_FORM_data4] ([[LOC:.*]]) +; CHECK-DWARF-NEXT: DW_AT_name {{.*}}"res" +; CHECK-DWARF: .debug_loc +; CHECK-DWARF: [[LOC]]: +; eax, piece 0x00000004, edx, piece 0x00000004 +; CHECK-DWARF: Location description: 50 93 04 52 93 04 + +; Function Attrs: nounwind readnone ssp +define i64 @foo(i64 %a, i64 %b, i64 %c) #0 { +entry: + tail call void @llvm.dbg.value(metadata !{i64 %a}, i64 0, metadata !10), !dbg !17 + tail call void @llvm.dbg.value(metadata !{i64 %b}, i64 0, metadata !11), !dbg !17 + tail call void @llvm.dbg.value(metadata !{i64 %c}, i64 0, metadata !12), !dbg !17 + tail call void @llvm.dbg.value(metadata !{i64 %add}, i64 0, metadata !13), !dbg !18 + %cmp = icmp eq i64 %a, %b, !dbg !19 + %add = add nsw i64 %c, 1, !dbg !18 + %retval.0 = select i1 %cmp, i64 %add, i64 0, !dbg !19 + ret i64 %retval.0, !dbg !21 +} + +; Function Attrs: nounwind readnone +declare void @llvm.dbg.value(metadata, i64, metadata) #1 + +attributes #0 = { nounwind readnone ssp } +attributes #1 = { nounwind readnone } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!14, !15} +!llvm.ident = !{!16} + +!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.5 ", i1 true, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !2, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [sdagsplit-1.c] [DW_LANG_C99] +!1 = metadata !{metadata !"sdagsplit-1.c", metadata !""} +!2 = metadata !{} +!3 = metadata !{metadata !4} +!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"foo", metadata !"foo", metadata !"", i32 149, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, i64 (i64, i64, i64)* @foo, null, null, metadata !9, i32 150} ; [ DW_TAG_subprogram ] [line 149] [def] [scope 150] [foo] +!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [sdagsplit-1.c] +!6 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] +!7 = metadata !{metadata !8, metadata !8, metadata !8, metadata !8} +!8 = metadata !{i32 786468, null, null, metadata !"long long int", i32 0, i64 64, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [long long int] [line 0, size 64, align 32, offset 0, enc DW_ATE_signed] +!9 = metadata !{metadata !10, metadata !11, metadata !12, metadata !13} +!10 = metadata !{i32 786689, metadata !4, metadata !"a", metadata !5, i32 16777365, metadata !8, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [a] [line 149] +!11 = metadata !{i32 786689, metadata !4, metadata !"b", metadata !5, i32 33554581, metadata !8, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [b] [line 149] +!12 = metadata !{i32 786689, metadata !4, metadata !"c", metadata !5, i32 50331797, metadata !8, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [c] [line 149] +!13 = metadata !{i32 786688, metadata !4, metadata !"res", metadata !5, i32 151, metadata !8, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [res] [line 151] +!14 = metadata !{i32 2, metadata !"Dwarf Version", i32 2} +!15 = metadata !{i32 1, metadata !"Debug Info Version", i32 1} +!16 = metadata !{metadata !"clang version 3.5 "} +!17 = metadata !{i32 149, i32 0, metadata !4, null} +!18 = metadata !{i32 151, i32 0, metadata !4, null} +!19 = metadata !{i32 152, i32 0, metadata !20, null} +!20 = metadata !{i32 786443, metadata !1, metadata !4, i32 152, i32 0, i32 0} ; [ DW_TAG_lexical_block ] [sdagsplit-1.c] +!21 = metadata !{i32 155, i32 0, metadata !4, null} \ No newline at end of file Index: test/DebugInfo/X86/sdagsplit-2.ll =================================================================== --- /dev/null +++ test/DebugInfo/X86/sdagsplit-2.ll @@ -0,0 +1,69 @@ +; RUN: llc %s -filetype=obj -o %t.o +; RUN: llvm-dwarfdump %t.o | FileCheck --check-prefix=CHECK-DWARF %s +; +; rdar://problem/15928306 +; +; Test that we can emit debug info for large values that are split +; up across multiple registers by the SelectionDAG type legalizer. +; +; // Compile with -O1 -m32. +; long long foo (long long a, long long b, long long c) +; { +; long long res = c+1; +; if ( a == b ) +; return res; +; return res+b; +; } +target datalayout = "e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128" +target triple = "i386-apple-macosx10.9.0" + +; CHECK-DWARF: "res" +; piece 0x00000004, edx, piece 0x00000004 +; CHECK-DWARF: 93 04 52 93 04 + +; Function Attrs: nounwind readnone ssp +define i64 @foo(i64 %a, i64 %b, i64 %c) #0 { +entry: + tail call void @llvm.dbg.value(metadata !{i64 %a}, i64 0, metadata !10), !dbg !17 + tail call void @llvm.dbg.value(metadata !{i64 %b}, i64 0, metadata !11), !dbg !17 + tail call void @llvm.dbg.value(metadata !{i64 %c}, i64 0, metadata !12), !dbg !17 + %add = add nsw i64 %c, 1, !dbg !18 + tail call void @llvm.dbg.value(metadata !{i64 %add}, i64 0, metadata !13), !dbg !18 + %cmp = icmp eq i64 %a, %b, !dbg !19 + %add1 = select i1 %cmp, i64 0, i64 %b, !dbg !19 + %retval.0 = add nsw i64 %add, %add1, !dbg !19 + ret i64 %retval.0, !dbg !21 +} + +; Function Attrs: nounwind readnone +declare void @llvm.dbg.value(metadata, i64, metadata) #1 + +attributes #0 = { nounwind readnone ssp } +attributes #1 = { nounwind readnone } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!14, !15} +!llvm.ident = !{!16} + +!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.5 ", i1 true, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !2, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [sdagsplit-2.c] [DW_LANG_C99] +!1 = metadata !{metadata !"sdagsplit-2.c", metadata !""} +!2 = metadata !{} +!3 = metadata !{metadata !4} +!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"foo", metadata !"foo", metadata !"", i32 149, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, i64 (i64, i64, i64)* @foo, null, null, metadata !9, i32 150} ; [ DW_TAG_subprogram ] [line 149] [def] [scope 150] [foo] +!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [sdagsplit-2.c] +!6 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] +!7 = metadata !{metadata !8, metadata !8, metadata !8, metadata !8} +!8 = metadata !{i32 786468, null, null, metadata !"long long int", i32 0, i64 64, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [long long int] [line 0, size 64, align 32, offset 0, enc DW_ATE_signed] +!9 = metadata !{metadata !10, metadata !11, metadata !12, metadata !13} +!10 = metadata !{i32 786689, metadata !4, metadata !"a", metadata !5, i32 16777365, metadata !8, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [a] [line 149] +!11 = metadata !{i32 786689, metadata !4, metadata !"b", metadata !5, i32 33554581, metadata !8, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [b] [line 149] +!12 = metadata !{i32 786689, metadata !4, metadata !"c", metadata !5, i32 50331797, metadata !8, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [c] [line 149] +!13 = metadata !{i32 786688, metadata !4, metadata !"res", metadata !5, i32 151, metadata !8, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [res] [line 151] +!14 = metadata !{i32 2, metadata !"Dwarf Version", i32 2} +!15 = metadata !{i32 1, metadata !"Debug Info Version", i32 1} +!16 = metadata !{metadata !"clang version 3.5 "} +!17 = metadata !{i32 149, i32 0, metadata !4, null} +!18 = metadata !{i32 151, i32 0, metadata !4, null} +!19 = metadata !{i32 152, i32 0, metadata !20, null} +!20 = metadata !{i32 786443, metadata !1, metadata !4, i32 152, i32 0, i32 0} ; [ DW_TAG_lexical_block ] [sdagsplit-2.c] +!21 = metadata !{i32 155, i32 0, metadata !4, null} \ No newline at end of file Index: test/DebugInfo/X86/sroasplit-1.ll =================================================================== --- /dev/null +++ test/DebugInfo/X86/sroasplit-1.ll @@ -0,0 +1,97 @@ +; RUN: opt %s -sroa -verify -S -o - | FileCheck --check-prefix=CHECK-OPT %s +; +; rdar://problem/15928306 +; +; Test that we can partial emit debug info for aggregates repeatedly +; split up by SROA. +; +; // Compile with -O1 +; typedef struct { +; int a; +; long int b; +; } Inner; +; +; typedef struct { +; Inner inner[2]; +; } Outer; +; +; int foo(Outer outer) { +; Inner i1 = outer.inner[1]; +; return i1.a; +; } +; + +; Verify that SROA creates a variable piece when splitting i1. +; CHECK-OPT: %[[I1:.*]] = alloca [12 x i8], align 4 +; CHECK-OPT: call void @llvm.dbg.declare(metadata !{[12 x i8]* %[[I1]]}, metadata ![[PIECE:[0-9]+]]) +; CHECK-OPT: ![[PIECE]] = {{.*}} ; [ DW_TAG_auto_variable ] [i1] [line 11] [piece, size 12, offset 0] + +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-apple-macosx10.9.0" + +%struct.Outer = type { [2 x %struct.Inner] } +%struct.Inner = type { i32, i64 } + +; Function Attrs: nounwind ssp uwtable +define i32 @foo(%struct.Outer* byval align 8 %outer) #0 { +entry: + %i1 = alloca %struct.Inner, align 8 + call void @llvm.dbg.declare(metadata !{%struct.Outer* %outer}, metadata !25), !dbg !26 + call void @llvm.dbg.declare(metadata !{%struct.Inner* %i1}, metadata !27), !dbg !28 + %inner = getelementptr inbounds %struct.Outer* %outer, i32 0, i32 0, !dbg !28 + %arrayidx = getelementptr inbounds [2 x %struct.Inner]* %inner, i32 0, i64 1, !dbg !28 + %0 = bitcast %struct.Inner* %i1 to i8*, !dbg !28 + %1 = bitcast %struct.Inner* %arrayidx to i8*, !dbg !28 + call void @llvm.memcpy.p0i8.p0i8.i64(i8* %0, i8* %1, i64 16, i32 8, i1 false), !dbg !28 + %a = getelementptr inbounds %struct.Inner* %i1, i32 0, i32 0, !dbg !29 + %2 = load i32* %a, align 4, !dbg !29 + ret i32 %2, !dbg !29 +} + +; Function Attrs: nounwind readnone +declare void @llvm.dbg.declare(metadata, metadata) #1 + +; Function Attrs: nounwind +declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture readonly, i64, i32, i1) #2 + +; Function Attrs: nounwind readnone +declare void @llvm.dbg.value(metadata, i64, metadata) #1 + +attributes #0 = { nounwind ssp uwtable } +attributes #1 = { nounwind readnone } +attributes #2 = { nounwind } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!22, !23} +!llvm.ident = !{!24} + +!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.5.0 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !2, metadata !2, metadata !"", i32 1} ; [ DW_TAG_compile_unit ] [sroasplit-1.c] [DW_LANG_C99] +!1 = metadata !{metadata !"sroasplit-1.c", metadata !""} +!2 = metadata !{} +!3 = metadata !{metadata !4} +!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"foo", metadata !"foo", metadata !"", i32 10, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 (%struct.Outer*)* @foo, null, null, metadata !2, i32 10} ; [ DW_TAG_subprogram ] [line 10] [def] [foo] +!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [sroasplit-1.c] +!6 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] +!7 = metadata !{metadata !8, metadata !9} +!8 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed] +!9 = metadata !{i32 786454, metadata !1, null, metadata !"Outer", i32 8, i64 0, i64 0, i64 0, i32 0, metadata !10} ; [ DW_TAG_typedef ] [Outer] [line 8, size 0, align 0, offset 0] [from ] +!10 = metadata !{i32 786451, metadata !1, null, metadata !"", i32 6, i64 256, i64 64, i32 0, i32 0, null, metadata !11, i32 0, null, null, null} ; [ DW_TAG_structure_type ] [line 6, size 256, align 64, offset 0] [def] [from ] +!11 = metadata !{metadata !12} +!12 = metadata !{i32 786445, metadata !1, metadata !10, metadata !"inner", i32 7, i64 256, i64 64, i64 0, i32 0, metadata !13} ; [ DW_TAG_member ] [inner] [line 7, size 256, align 64, offset 0] [from ] +!13 = metadata !{i32 786433, null, null, metadata !"", i32 0, i64 256, i64 64, i32 0, i32 0, metadata !14, metadata !20, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 256, align 64, offset 0] [from Inner] +!14 = metadata !{i32 786454, metadata !1, null, metadata !"Inner", i32 4, i64 0, i64 0, i64 0, i32 0, metadata !15} ; [ DW_TAG_typedef ] [Inner] [line 4, size 0, align 0, offset 0] [from ] +!15 = metadata !{i32 786451, metadata !1, null, metadata !"", i32 1, i64 128, i64 64, i32 0, i32 0, null, metadata !16, i32 0, null, null, null} ; [ DW_TAG_structure_type ] [line 1, size 128, align 64, offset 0] [def] [from ] +!16 = metadata !{metadata !17, metadata !18} +!17 = metadata !{i32 786445, metadata !1, metadata !15, metadata !"a", i32 2, i64 32, i64 32, i64 0, i32 0, metadata !8} ; [ DW_TAG_member ] [a] [line 2, size 32, align 32, offset 0] [from int] +!18 = metadata !{i32 786445, metadata !1, metadata !15, metadata !"b", i32 3, i64 64, i64 64, i64 64, i32 0, metadata !19} ; [ DW_TAG_member ] [b] [line 3, size 64, align 64, offset 64] [from long int] +!19 = metadata !{i32 786468, null, null, metadata !"long int", i32 0, i64 64, i64 64, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [long int] [line 0, size 64, align 64, offset 0, enc DW_ATE_signed] +!20 = metadata !{metadata !21} +!21 = metadata !{i32 786465, i64 0, i64 2} ; [ DW_TAG_subrange_type ] [0, 1] +!22 = metadata !{i32 2, metadata !"Dwarf Version", i32 2} +!23 = metadata !{i32 1, metadata !"Debug Info Version", i32 1} +!24 = metadata !{metadata !"clang version 3.5.0 "} +!25 = metadata !{i32 786689, metadata !4, metadata !"outer", metadata !5, i32 16777226, metadata !9, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [outer] [line 10] +!26 = metadata !{i32 10, i32 0, metadata !4, null} +!27 = metadata !{i32 786688, metadata !4, metadata !"i1", metadata !5, i32 11, metadata !14, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [i1] [line 11] +!28 = metadata !{i32 11, i32 0, metadata !4, null} +!29 = metadata !{i32 12, i32 0, metadata !4, null} \ No newline at end of file Index: test/DebugInfo/X86/sroasplit-2.ll =================================================================== --- /dev/null +++ test/DebugInfo/X86/sroasplit-2.ll @@ -0,0 +1,102 @@ +; RUN: opt %s -sroa -verify -S -o - | FileCheck --check-prefix=CHECK-OPT %s +; +; rdar://problem/15928306 +; +; Test that we can partial emit debug info for aggregates repeatedly +; split up by SROA. +; +; // Compile with -O1 +; typedef struct { +; int a; +; int b; +; } Inner; +; +; typedef struct { +; Inner inner[2]; +; } Outer; +; +; int foo(Outer outer) { +; Inner i1 = outer.inner[1]; +; return i1.a; +; } +; + +; Verify that SROA creates a variable piece when splitting i1. +; CHECK-OPT: call void @llvm.dbg.value(metadata !{i64 %outer.coerce0}, i64 0, metadata ![[O1:.*]]), +; CHECK-OPT: call void @llvm.dbg.value(metadata !{i64 %outer.coerce1}, i64 0, metadata ![[O2:.*]]), +; CHECK-OPT: call void @llvm.dbg.value({{.*}}, i64 0, metadata ![[I1:.*]]), +; CHECK-OPT-DAG: ![[O2]] = {{.*}} [ DW_TAG_arg_variable ] [outer] [line 10] [piece, size 4, offset 12] +; CHECK-OPT-DAG: ![[O1]] = {{.*}} [ DW_TAG_arg_variable ] [outer] [line 10] [piece, size 8, offset 0] +; CHECK-OPT-DAG: ![[I1]] = {{.*}} [ DW_TAG_auto_variable ] [i1] [line 11] [piece, size 4, offset 0] + +; ModuleID = 'sroasplit-2.c' +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-apple-macosx10.9.0" + +%struct.Outer = type { [2 x %struct.Inner] } +%struct.Inner = type { i32, i32 } + +; Function Attrs: nounwind ssp uwtable +define i32 @foo(i64 %outer.coerce0, i64 %outer.coerce1) #0 { + %outer = alloca %struct.Outer, align 8 + %i1 = alloca %struct.Inner, align 4 + %1 = bitcast %struct.Outer* %outer to { i64, i64 }* + %2 = getelementptr { i64, i64 }* %1, i32 0, i32 0 + store i64 %outer.coerce0, i64* %2 + %3 = getelementptr { i64, i64 }* %1, i32 0, i32 1 + store i64 %outer.coerce1, i64* %3 + call void @llvm.dbg.declare(metadata !{%struct.Outer* %outer}, metadata !24), !dbg !25 + call void @llvm.dbg.declare(metadata !{%struct.Inner* %i1}, metadata !26), !dbg !27 + %4 = getelementptr inbounds %struct.Outer* %outer, i32 0, i32 0, !dbg !27 + %5 = getelementptr inbounds [2 x %struct.Inner]* %4, i32 0, i64 1, !dbg !27 + %6 = bitcast %struct.Inner* %i1 to i8*, !dbg !27 + %7 = bitcast %struct.Inner* %5 to i8*, !dbg !27 + call void @llvm.memcpy.p0i8.p0i8.i64(i8* %6, i8* %7, i64 8, i32 4, i1 false), !dbg !27 + %8 = getelementptr inbounds %struct.Inner* %i1, i32 0, i32 0, !dbg !28 + %9 = load i32* %8, align 4, !dbg !28 + ret i32 %9, !dbg !28 +} + +; Function Attrs: nounwind readnone +declare void @llvm.dbg.declare(metadata, metadata) #1 + +; Function Attrs: nounwind +declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture readonly, i64, i32, i1) #2 + +attributes #0 = { nounwind ssp uwtable "no-frame-pointer-elim"="true" } +attributes #1 = { nounwind readnone } +attributes #2 = { nounwind } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!21, !22} +!llvm.ident = !{!23} + +!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.5.0 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !2, metadata !2, metadata !"", i32 1} ; [ DW_TAG_compile_unit ] [sroasplit-2.c] [DW_LANG_C99] +!1 = metadata !{metadata !"sroasplit-2.c", metadata !""} +!2 = metadata !{} +!3 = metadata !{metadata !4} +!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"foo", metadata !"foo", metadata !"", i32 10, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 (i64, i64)* @foo, null, null, metadata !2, i32 10} ; [ DW_TAG_subprogram ] [line 10] [def] [foo] +!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [sroasplit-2.c] +!6 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] +!7 = metadata !{metadata !8, metadata !9} +!8 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed] +!9 = metadata !{i32 786454, metadata !1, null, metadata !"Outer", i32 8, i64 0, i64 0, i64 0, i32 0, metadata !10} ; [ DW_TAG_typedef ] [Outer] [line 8, size 0, align 0, offset 0] [from ] +!10 = metadata !{i32 786451, metadata !1, null, metadata !"", i32 6, i64 128, i64 32, i32 0, i32 0, null, metadata !11, i32 0, null, null, null} ; [ DW_TAG_structure_type ] [line 6, size 128, align 32, offset 0] [def] [from ] +!11 = metadata !{metadata !12} +!12 = metadata !{i32 786445, metadata !1, metadata !10, metadata !"inner", i32 7, i64 128, i64 32, i64 0, i32 0, metadata !13} ; [ DW_TAG_member ] [inner] [line 7, size 128, align 32, offset 0] [from ] +!13 = metadata !{i32 786433, null, null, metadata !"", i32 0, i64 128, i64 32, i32 0, i32 0, metadata !14, metadata !19, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 128, align 32, offset 0] [from Inner] +!14 = metadata !{i32 786454, metadata !1, null, metadata !"Inner", i32 4, i64 0, i64 0, i64 0, i32 0, metadata !15} ; [ DW_TAG_typedef ] [Inner] [line 4, size 0, align 0, offset 0] [from ] +!15 = metadata !{i32 786451, metadata !1, null, metadata !"", i32 1, i64 64, i64 32, i32 0, i32 0, null, metadata !16, i32 0, null, null, null} ; [ DW_TAG_structure_type ] [line 1, size 64, align 32, offset 0] [def] [from ] +!16 = metadata !{metadata !17, metadata !18} +!17 = metadata !{i32 786445, metadata !1, metadata !15, metadata !"a", i32 2, i64 32, i64 32, i64 0, i32 0, metadata !8} ; [ DW_TAG_member ] [a] [line 2, size 32, align 32, offset 0] [from int] +!18 = metadata !{i32 786445, metadata !1, metadata !15, metadata !"b", i32 3, i64 32, i64 32, i64 32, i32 0, metadata !8} ; [ DW_TAG_member ] [b] [line 3, size 32, align 32, offset 32] [from int] +!19 = metadata !{metadata !20} +!20 = metadata !{i32 786465, i64 0, i64 2} ; [ DW_TAG_subrange_type ] [0, 1] +!21 = metadata !{i32 2, metadata !"Dwarf Version", i32 2} +!22 = metadata !{i32 1, metadata !"Debug Info Version", i32 1} +!23 = metadata !{metadata !"clang version 3.5.0 "} +!24 = metadata !{i32 786689, metadata !4, metadata !"outer", metadata !5, i32 16777226, metadata !9, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [outer] [line 10] +!25 = metadata !{i32 10, i32 0, metadata !4, null} +!26 = metadata !{i32 786688, metadata !4, metadata !"i1", metadata !5, i32 11, metadata !14, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [i1] [line 11] +!27 = metadata !{i32 11, i32 0, metadata !4, null} +!28 = metadata !{i32 12, i32 0, metadata !4, null} \ No newline at end of file