Index: lib/Transforms/Scalar/SROA.cpp =================================================================== --- lib/Transforms/Scalar/SROA.cpp +++ lib/Transforms/Scalar/SROA.cpp @@ -967,6 +967,10 @@ /// 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; + public: SROA(bool RequiresDomTree = true) : FunctionPass(ID), RequiresDomTree(RequiresDomTree), @@ -2046,6 +2050,9 @@ // the insertion point is set to point to the user. IRBuilderTy IRB; + DenseMap& DbgDeclares; + DIBuilder DIB; + public: AllocaSliceRewriter(const DataLayout &DL, AllocaSlices &S, SROA &Pass, AllocaInst &OldAI, AllocaInst &NewAI, @@ -2053,7 +2060,8 @@ uint64_t NewAllocaEndOffset, bool IsVectorPromotable, bool IsIntegerPromotable, SmallPtrSetImpl &PHIUsers, - SmallPtrSetImpl &SelectUsers) + SmallPtrSetImpl &SelectUsers, + DenseMap& DbgDeclares) : DL(DL), S(S), Pass(Pass), OldAI(OldAI), NewAI(NewAI), NewAllocaBeginOffset(NewAllocaBeginOffset), NewAllocaEndOffset(NewAllocaEndOffset), @@ -2068,7 +2076,9 @@ : nullptr), BeginOffset(), EndOffset(), IsSplittable(), IsSplit(), OldUse(), OldPtr(), PHIUsers(PHIUsers), SelectUsers(SelectUsers), - IRB(NewAI.getContext(), ConstantFolder()) { + IRB(NewAI.getContext(), ConstantFolder()), + DbgDeclares(DbgDeclares), + DIB(*NewAI.getParent()->getParent()->getParent()) { if (VecTy) { assert((DL.getTypeSizeInBits(ElementTy) % 8) == 0 && "Only multiple-of-8 sized vector elements are viable"); @@ -2102,6 +2112,19 @@ 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()); + // Create a variable piece to describe the slice. This works fine + // even if Var already was a piece. + DIVariable Piece = 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); @@ -3189,7 +3212,8 @@ AllocaSliceRewriter Rewriter(*DL, S, *this, AI, *NewAI, BeginOffset, EndOffset, IsVectorPromotable, - IsIntegerPromotable, PHIUsers, SelectUsers); + IsIntegerPromotable, PHIUsers, SelectUsers, + DbgDeclares); bool Promotable = true; for (ArrayRef::const_iterator SUI = SplitUses.begin(), SUE = SplitUses.end(); @@ -3624,6 +3648,7 @@ DEBUG(dbgs() << " Skipping SROA -- no target data!\n"); return false; } + DL = &DLP->getDataLayout(); DominatorTreeWrapperPass *DTWP = getAnalysisIfAvailable(); @@ -3631,9 +3656,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/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