<div dir="ltr">Right, I will update this thread once I scrape the file from the bot and creduce it (should be soon).</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 7, 2015 at 2:15 PM, Adrian Prantl <span dir="ltr"><<a href="mailto:aprantl@apple.com" target="_blank">aprantl@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word"><div><span class=""><blockquote type="cite"><div>On Jan 7, 2015, at 2:10 PM, Alexey Samsonov <<a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a>> wrote:</div><br><div><div dir="ltr">I still observe a crash, this time on our internal buildbot, and not on LLVM sources.<div>This is a heads up, I will work on reduction/reproducer.<br></div></div></div></blockquote><div><br></div></span>Thanks! This is actually a different assertion as last time, so this is going to be quite interesting. For starters, the type of the variable and the IR around the dbg.value() might be enough to understand what’s going on.</div><span class="HOEnZb"><font color="#888888"><div><br></div></font></span><div><span class="HOEnZb"><font color="#888888">-- adrian</font></span><div><div class="h5"><br><blockquote type="cite"><div><div dir="ltr"><div><div><br></div><div><div>clang: slave/linux/build/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp:1687: void llvm::DwarfDebug::emitLocPieces(llvm::ByteStreamer&, const DITypeIdentifierMap&, llvm::ArrayRef<llvm::DebugLocEntry::Value>): Assertion `!Var.isIndirect() && "indirect address for piece"' failed.</div><div>#0 0x2842782 llvm::sys::PrintStackTrace(_IO_FILE*) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x2842782)</div><div>#1 0x2840911 SignalHandler(int) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x2840911)</div><div>#2 0x2b90dd1cc340 __restore_rt (/lib/x86_64-linux-gnu/libpthread.so.0+0x10340)</div><div>#3 0x2b90de05dbb9 gsignal /build/buildd/eglibc-2.19/signal/../nptl/sysdeps/unix/sysv/linux/raise.c:56:0</div><div>#4 0x2b90de060fc8 abort /build/buildd/eglibc-2.19/stdlib/abort.c:91:0</div><div>#5 0x2b90de056a76 __assert_fail_base /build/buildd/eglibc-2.19/assert/assert.c:92:0</div><div>#6 0x2b90de056b22 (/lib/x86_64-linux-gnu/libc.so.6+0x2fb22)</div><div>#7 0x206b660 llvm::DwarfDebug::emitLocPieces(llvm::ByteStreamer&, llvm::DenseMap<llvm::MDString const*, llvm::MDNode*, llvm::DenseMapInfo<llvm::MDString const*>, llvm::detail::DenseMapPair<llvm::MDString const*, llvm::MDNode*> > const&, llvm::ArrayRef<llvm::DebugLocEntry::Value>) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x206b660)</div><div>#8 0x206b8b6 llvm::DwarfDebug::emitDebugLocEntry(llvm::ByteStreamer&, llvm::DebugLocEntry const&) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x206b8b6)</div><div>#9 0x206b9b4 llvm::DwarfDebug::emitDebugLocEntryLocation(llvm::DebugLocEntry const&) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x206b9b4)</div><div>#10 0x206baba llvm::DwarfDebug::emitDebugLoc() (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x206baba)</div><div>#11 0x2074a96 llvm::DwarfDebug::endModule() (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x2074a96)</div><div>#12 0x2058cf0 llvm::AsmPrinter::doFinalization(llvm::Module&) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x2058cf0)</div><div>#13 0x27c257b llvm::FPPassManager::doFinalization(llvm::Module&) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x27c257b)</div><div>#14 0x27cbd27 llvm::legacy::PassManagerImpl::run(llvm::Module&) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x27cbd27)</div><div>#15 0xadc027 clang::EmitBackendOutput(clang::DiagnosticsEngine&, clang::CodeGenOptions const&, clang::TargetOptions const&, clang::LangOptions const&, llvm::StringRef, llvm::Module*, clang::BackendAction, llvm::raw_ostream*) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0xadc027)</div><div>#16 0xace2d6 clang::BackendConsumer::HandleTranslationUnit(clang::ASTContext&) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0xace2d6)</div><div>#17 0xc7d633 clang::ParseAST(clang::Sema&, bool, bool) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0xc7d633)</div><div>#18 0xacefee clang::CodeGenAction::ExecuteAction() (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0xacefee)</div><div>#19 0x92b976 clang::FrontendAction::Execute() (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x92b976)</div><div>#20 0x908bd9 clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x908bd9)</div><div>#21 0x8f0cae clang::ExecuteCompilerInvocation(clang::CompilerInstance*) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x8f0cae)</div><div>#22 0x8e9198 cc1_main(llvm::ArrayRef<char const*>, char const*, void*) (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x8e9198)</div><div>#23 0x8c4b4b main (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x8c4b4b)</div><div>#24 0x2b90de048ec5 __libc_start_main /build/buildd/eglibc-2.19/csu/libc-start.c:321:0</div><div>#25 0x8e7efa _start (slave/linux/build/llvm-build/Release+Asserts/bin/clang+0x8e7efa)</div></div><div><br></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 7, 2015 at 12:52 PM, Adrian Prantl <span dir="ltr"><<a href="mailto:aprantl@apple.com" target="_blank">aprantl@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: adrian<br>
Date: Wed Jan 7 14:52:22 2015<br>
New Revision: 225379<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=225379&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=225379&view=rev</a><br>
Log:<br>
Reapply: Teach SROA how to update debug info for fragmented variables.<br>
<br>
The two buildbot failures were addressed in LLVM r225378 and CFE r225359.<br>
<br>
This rapplies commit 225272 without modifications.<br>
<br>
Added:<br>
llvm/trunk/test/DebugInfo/X86/sroasplit-1.ll<br>
llvm/trunk/test/DebugInfo/X86/sroasplit-2.ll<br>
llvm/trunk/test/DebugInfo/X86/sroasplit-3.ll<br>
Modified:<br>
llvm/trunk/lib/Transforms/Scalar/SROA.cpp<br>
llvm/trunk/test/DebugInfo/X86/array2.ll<br>
<br>
Modified: llvm/trunk/lib/Transforms/Scalar/SROA.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SROA.cpp?rev=225379&r1=225378&r2=225379&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SROA.cpp?rev=225379&r1=225378&r2=225379&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/Scalar/SROA.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/Scalar/SROA.cpp Wed Jan 7 14:52:22 2015<br>
@@ -1240,6 +1240,10 @@ class SROA : public FunctionPass {<br>
/// currently in the promotable queue.<br>
SetVector<SelectInst *, SmallVector<SelectInst *, 2>> SpeculatableSelects;<br>
<br>
+ /// Debug intrinsics do not show up as regular uses in the<br>
+ /// IR. This side-table holds the missing use edges.<br>
+ DenseMap<AllocaInst *, DbgDeclareInst *> DbgDeclares;<br>
+<br>
public:<br>
SROA(bool RequiresDomTree = true)<br>
: FunctionPass(ID), RequiresDomTree(RequiresDomTree), C(nullptr),<br>
@@ -1257,8 +1261,8 @@ private:<br>
friend class AllocaSliceRewriter;<br>
<br>
bool presplitLoadsAndStores(AllocaInst &AI, AllocaSlices &AS);<br>
- bool rewritePartition(AllocaInst &AI, AllocaSlices &AS,<br>
- AllocaSlices::Partition &P);<br>
+ AllocaInst *rewritePartition(AllocaInst &AI, AllocaSlices &AS,<br>
+ AllocaSlices::Partition &P);<br>
bool splitAlloca(AllocaInst &AI, AllocaSlices &AS);<br>
bool runOnAlloca(AllocaInst &AI);<br>
void clobberUse(Use &U);<br>
@@ -3964,8 +3968,8 @@ bool SROA::presplitLoadsAndStores(Alloca<br>
/// appropriate new offsets. It also evaluates how successful the rewrite was<br>
/// at enabling promotion and if it was successful queues the alloca to be<br>
/// promoted.<br>
-bool SROA::rewritePartition(AllocaInst &AI, AllocaSlices &AS,<br>
- AllocaSlices::Partition &P) {<br>
+AllocaInst *SROA::rewritePartition(AllocaInst &AI, AllocaSlices &AS,<br>
+ AllocaSlices::Partition &P) {<br>
// Try to compute a friendly type for this partition of the alloca. This<br>
// won't always succeed, in which case we fall back to a legal integer type<br>
// or an i8 array of an appropriate size.<br>
@@ -4003,6 +4007,7 @@ bool SROA::rewritePartition(AllocaInst &<br>
NewAI = &AI;<br>
// FIXME: We should be able to bail at this point with "nothing changed".<br>
// FIXME: We might want to defer PHI speculation until after here.<br>
+ // FIXME: return nullptr;<br>
} else {<br>
unsigned Alignment = AI.getAlignment();<br>
if (!Alignment) {<br>
@@ -4098,7 +4103,7 @@ bool SROA::rewritePartition(AllocaInst &<br>
PostPromotionWorklist.pop_back();<br>
}<br>
<br>
- return true;<br>
+ return NewAI;<br>
}<br>
<br>
/// \brief Walks the slices of an alloca and form partitions based on them,<br>
@@ -4137,9 +4142,24 @@ bool SROA::splitAlloca(AllocaInst &AI, A<br>
if (!IsSorted)<br>
std::sort(AS.begin(), AS.end());<br>
<br>
+ /// \brief Describes the allocas introduced by rewritePartition<br>
+ /// in order to migrate the debug info.<br>
+ struct Piece {<br>
+ AllocaInst *Alloca;<br>
+ uint64_t Offset;<br>
+ uint64_t Size;<br>
+ Piece(AllocaInst *AI, uint64_t O, uint64_t S)<br>
+ : Alloca(AI), Offset(O), Size(S) {}<br>
+ };<br>
+ SmallVector<Piece, 4> Pieces;<br>
+<br>
// Rewrite each partition.<br>
for (auto &P : AS.partitions()) {<br>
- Changed |= rewritePartition(AI, AS, P);<br>
+ if (AllocaInst *NewAI = rewritePartition(AI, AS, P)) {<br>
+ Changed = true;<br>
+ if (NewAI != &AI)<br>
+ Pieces.push_back(Piece(NewAI, P.beginOffset(), P.size()));<br>
+ }<br>
++NumPartitions;<br>
}<br>
<br>
@@ -4147,6 +4167,28 @@ bool SROA::splitAlloca(AllocaInst &AI, A<br>
MaxPartitionsPerAlloca =<br>
std::max<unsigned>(NumPartitions, MaxPartitionsPerAlloca);<br>
<br>
+ // Migrate debug information from the old alloca to the new alloca(s)<br>
+ // and the individial partitions.<br>
+ if (DbgDeclareInst *DbgDecl = DbgDeclares.lookup(&AI)) {<br>
+ DIVariable Var(DbgDecl->getVariable());<br>
+ DIExpression Expr(DbgDecl->getExpression());<br>
+ DIBuilder DIB(*AI.getParent()->getParent()->getParent(),<br>
+ /*AllowUnresolved*/ false);<br>
+ bool IsSplit = Pieces.size() > 1;<br>
+ for (auto Piece : Pieces) {<br>
+ // Create a piece expression describing the new partition or reuse AI's<br>
+ // expression if there is only one partition.<br>
+ if (IsSplit)<br>
+ Expr = DIB.createPieceExpression(Piece.Offset, Piece.Size);<br>
+ Instruction *NewDDI = DIB.insertDeclare(Piece.Alloca, Var, Expr, &AI);<br>
+ NewDDI->setDebugLoc(DbgDecl->getDebugLoc());<br>
+ assert((!DbgDeclares.count(Piece.Alloca) ||<br>
+ DbgDeclares[Piece.Alloca] == cast<DbgDeclareInst>(NewDDI)<br>
+ ) && "alloca already described");<br>
+ DbgDeclares.insert(std::make_pair(Piece.Alloca,<br>
+ cast<DbgDeclareInst>(NewDDI)));<br>
+ }<br>
+ }<br>
return Changed;<br>
}<br>
<br>
@@ -4258,8 +4300,13 @@ void SROA::deleteDeadInstructions(<br>
DeadInsts.insert(U);<br>
}<br>
<br>
- if (AllocaInst *AI = dyn_cast<AllocaInst>(I))<br>
+ if (AllocaInst *AI = dyn_cast<AllocaInst>(I)) {<br>
DeletedAllocas.insert(AI);<br>
+ if (DbgDeclareInst *DbgDecl = DbgDeclares.lookup(AI)) {<br>
+ DbgDecl->eraseFromParent();<br>
+ DbgDeclares.erase(AI);<br>
+ }<br>
+ }<br>
<br>
++NumDeleted;<br>
I->eraseFromParent();<br>
@@ -4374,11 +4421,16 @@ bool SROA::runOnFunction(Function &F) {<br>
DT = DTWP ? &DTWP->getDomTree() : nullptr;<br>
AC = &getAnalysis<AssumptionCacheTracker>().getAssumptionCache(F);<br>
<br>
+ DbgDeclares.clear();<br>
BasicBlock &EntryBB = F.getEntryBlock();<br>
for (BasicBlock::iterator I = EntryBB.begin(), E = std::prev(EntryBB.end());<br>
- I != E; ++I)<br>
+ I != E; ++I) {<br>
if (AllocaInst *AI = dyn_cast<AllocaInst>(I))<br>
Worklist.insert(AI);<br>
+ else if (DbgDeclareInst *DDI = dyn_cast<DbgDeclareInst>(I))<br>
+ if (auto AI = dyn_cast_or_null<AllocaInst>(DDI->getAddress()))<br>
+ DbgDeclares.insert(std::make_pair(AI, DDI));<br>
+ }<br>
<br>
bool Changed = false;<br>
// A set of deleted alloca instruction pointers which should be removed from<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/array2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/array2.ll?rev=225379&r1=225378&r2=225379&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/array2.ll?rev=225379&r1=225378&r2=225379&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/array2.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/array2.ll Wed Jan 7 14:52:22 2015<br>
@@ -13,12 +13,12 @@<br>
; }<br>
;<br>
; RUN: opt %s -O2 -S -o - | FileCheck %s<br>
-; Test that we do not lower dbg.declares for arrays.<br>
+; Test that we correctly lower dbg.declares for arrays.<br>
;<br>
; CHECK: define i32 @main<br>
-; CHECK: call void @llvm.dbg.value<br>
-; CHECK: call void @llvm.dbg.value<br>
-; CHECK: call void @llvm.dbg.declare<br>
+; CHECK: call void @llvm.dbg.value(metadata i32 42, i64 0, metadata ![[ARRAY:[0-9]+]], metadata ![[EXPR:[0-9]+]])<br>
+; CHECK: ![[ARRAY]] = {{.*}}; [ DW_TAG_auto_variable ] [array] [line 6]<br>
+; CHECK: ![[EXPR]] = {{.*}}; [ DW_TAG_expression ] [DW_OP_piece offset=0, size=4]<br>
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"<br>
target triple = "x86_64-apple-macosx10.9.0"<br>
<br>
<br>
Added: llvm/trunk/test/DebugInfo/X86/sroasplit-1.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/sroasplit-1.ll?rev=225379&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/sroasplit-1.ll?rev=225379&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/sroasplit-1.ll (added)<br>
+++ llvm/trunk/test/DebugInfo/X86/sroasplit-1.ll Wed Jan 7 14:52:22 2015<br>
@@ -0,0 +1,97 @@<br>
+; RUN: opt %s -sroa -verify -S -o - | FileCheck %s<br>
+;<br>
+; Test that we can partial emit debug info for aggregates repeatedly<br>
+; split up by SROA.<br>
+;<br>
+; // Compile with -O1<br>
+; typedef struct {<br>
+; int a;<br>
+; long int b;<br>
+; } Inner;<br>
+;<br>
+; typedef struct {<br>
+; Inner inner[2];<br>
+; } Outer;<br>
+;<br>
+; int foo(Outer outer) {<br>
+; Inner i1 = outer.inner[1];<br>
+; return i1.a;<br>
+; }<br>
+;<br>
+<br>
+; Verify that SROA creates a variable piece when splitting i1.<br>
+; CHECK: %[[I1:.*]] = alloca [12 x i8], align 4<br>
+; CHECK: call void @llvm.dbg.declare(metadata [12 x i8]* %[[I1]], metadata ![[VAR:[0-9]+]], metadata ![[PIECE1:[0-9]+]])<br>
+; CHECK: call void @llvm.dbg.value(metadata i32 %[[A:.*]], i64 0, metadata ![[VAR]], metadata ![[PIECE2:[0-9]+]])<br>
+; CHECK: ret i32 %[[A]]<br>
+; Read Var and Piece:<br>
+; CHECK: ![[VAR]] = {{.*}} ; [ DW_TAG_auto_variable ] [i1] [line 11]<br>
+; CHECK: ![[PIECE1]] = {{.*}} ; [ DW_TAG_expression ] [DW_OP_piece offset=4, size=12]<br>
+; CHECK: ![[PIECE2]] = {{.*}} ; [ DW_TAG_expression ] [DW_OP_piece offset=0, size=4]<br>
+<br>
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"<br>
+target triple = "x86_64-apple-macosx10.9.0"<br>
+<br>
+%struct.Outer = type { [2 x %struct.Inner] }<br>
+%struct.Inner = type { i32, i64 }<br>
+<br>
+; Function Attrs: nounwind ssp uwtable<br>
+define i32 @foo(%struct.Outer* byval align 8 %outer) #0 {<br>
+entry:<br>
+ %i1 = alloca %struct.Inner, align 8<br>
+ call void @llvm.dbg.declare(metadata %struct.Outer* %outer, metadata !25, metadata !2), !dbg !26<br>
+ call void @llvm.dbg.declare(metadata %struct.Inner* %i1, metadata !27, metadata !2), !dbg !28<br>
+ %inner = getelementptr inbounds %struct.Outer* %outer, i32 0, i32 0, !dbg !28<br>
+ %arrayidx = getelementptr inbounds [2 x %struct.Inner]* %inner, i32 0, i64 1, !dbg !28<br>
+ %0 = bitcast %struct.Inner* %i1 to i8*, !dbg !28<br>
+ %1 = bitcast %struct.Inner* %arrayidx to i8*, !dbg !28<br>
+ call void @llvm.memcpy.p0i8.p0i8.i64(i8* %0, i8* %1, i64 16, i32 8, i1 false), !dbg !28<br>
+ %a = getelementptr inbounds %struct.Inner* %i1, i32 0, i32 0, !dbg !29<br>
+ %2 = load i32* %a, align 4, !dbg !29<br>
+ ret i32 %2, !dbg !29<br>
+}<br>
+<br>
+; Function Attrs: nounwind readnone<br>
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1<br>
+<br>
+; Function Attrs: nounwind<br>
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture readonly, i64, i32, i1) #2<br>
+<br>
+attributes #0 = { nounwind ssp uwtable }<br>
+attributes #1 = { nounwind readnone }<br>
+attributes #2 = { nounwind }<br>
+<br>
+!<a href="http://llvm.dbg.cu/" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!22, !23}<br>
+!llvm.ident = !{!24}<br>
+<br>
+!0 = !{!"0x11\0012\00clang version 3.5.0 \000\00\000\00\001", !1, !2, !2, !3, !2, !2} ; [ DW_TAG_compile_unit ] [ DW_TAG_compile_unit ] [sroasplit-1.c] [DW_LANG_C99]<br>
+!1 = !{!"sroasplit-1.c", !""}<br>
+!2 = !{}<br>
+!3 = !{!4}<br>
+!4 = !{!"0x2e\00foo\00foo\00\0010\000\001\000\006\00256\000\0010", !1, !5, !6, null, i32 (%struct.Outer*)* @foo, null, null, !2} ; [ DW_TAG_subprogram ] [ DW_TAG_subprogram ] [line 10] [def] [foo]<br>
+!5 = !{!"0x29", !1} ; [ DW_TAG_file_type ] [ DW_TAG_file_type ] [sroasplit-1.c]<br>
+!6 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !7, null, null, null} ; [ DW_TAG_subroutine_type ] [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!7 = !{!8, !9}<br>
+!8 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
+!9 = !{!"0x16\00Outer\008\000\000\000\000", !1, null, !10} ; [ DW_TAG_typedef ] [ DW_TAG_typedef ] [Outer] [line 8, size 0, align 0, offset 0] [from ]<br>
+!10 = !{!"0x13\00\006\00256\0064\000\000\000", !1, null, null, !11, null, null, null} ; [ DW_TAG_structure_type ] [line 6, size 256, align 64, offset 0] [def] [from ]<br>
+!11 = !{!12}<br>
+!12 = !{!"0xd\00inner\007\00256\0064\000\000", !1, !10, !13} ; [ DW_TAG_member ] [inner] [line 7, size 256, align 64, offset 0] [from ]<br>
+!13 = !{!"0x1\00\000\00256\0064\000\000", null, null, !14, !20, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 256, align 64, offset 0] [from Inner]<br>
+!14 = !{!"0x16\00Inner\004\000\000\000\000", !1, null, !15} ; [ DW_TAG_typedef ] [ DW_TAG_typedef ] [Inner] [line 4, size 0, align 0, offset 0] [from ]<br>
+!15 = !{!"0x13\00\001\00128\0064\000\000\000", !1, null, null, !16, null, null, null} ; [ DW_TAG_structure_type ] [line 1, size 128, align 64, offset 0] [def] [from ]<br>
+!16 = !{!17, !18}<br>
+!17 = !{!"0xd\00a\002\0032\0032\000\000", !1, !15, !8} ; [ DW_TAG_member ] [a] [line 2, size 32, align 32, offset 0] [from int]<br>
+!18 = !{!"0xd\00b\003\0064\0064\0064\000", !1, !15, !19} ; [ DW_TAG_member ] [b] [line 3, size 64, align 64, offset 64] [from long int]<br>
+!19 = !{!"0x24\00long int\000\0064\0064\000\000\005", null, null} ; [ DW_TAG_base_type ] [ DW_TAG_base_type ] [long int] [line 0, size 64, align 64, offset 0, enc DW_ATE_signed]<br>
+!20 = !{!21}<br>
+!21 = !{!"0x21\000\002"} ; [ DW_TAG_subrange_type ] [0, 1]<br>
+!22 = !{i32 2, !"Dwarf Version", i32 2}<br>
+!23 = !{i32 1, !"Debug Info Version", i32 2}<br>
+!24 = !{!"clang version 3.5.0 "}<br>
+!25 = !{!"0x101\00outer\0016777226\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [ DW_TAG_arg_variable ] [outer] [line 10]<br>
+!26 = !{i32 10, i32 0, !4, null}<br>
+!27 = !{!"0x100\00i1\0011\000", !4, !5, !14} ; [ DW_TAG_auto_variable ] [ DW_TAG_auto_variable ] [i1] [line 11]<br>
+!28 = !{i32 11, i32 0, !4, null}<br>
+!29 = !{i32 12, i32 0, !4, null}<br>
<br>
Added: llvm/trunk/test/DebugInfo/X86/sroasplit-2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/sroasplit-2.ll?rev=225379&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/sroasplit-2.ll?rev=225379&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/sroasplit-2.ll (added)<br>
+++ llvm/trunk/test/DebugInfo/X86/sroasplit-2.ll Wed Jan 7 14:52:22 2015<br>
@@ -0,0 +1,102 @@<br>
+; RUN: opt %s -sroa -verify -S -o - | FileCheck %s<br>
+;<br>
+; Test that we can partial emit debug info for aggregates repeatedly<br>
+; split up by SROA.<br>
+;<br>
+; // Compile with -O1<br>
+; typedef struct {<br>
+; int a;<br>
+; int b;<br>
+; } Inner;<br>
+;<br>
+; typedef struct {<br>
+; Inner inner[2];<br>
+; } Outer;<br>
+;<br>
+; int foo(Outer outer) {<br>
+; Inner i1 = outer.inner[1];<br>
+; return i1.a;<br>
+; }<br>
+;<br>
+<br>
+; Verify that SROA creates a variable piece when splitting i1.<br>
+; CHECK: call void @llvm.dbg.value(metadata i64 %outer.coerce0, i64 0, metadata ![[O:[0-9]+]], metadata ![[PIECE1:[0-9]+]]),<br>
+; CHECK: call void @llvm.dbg.value(metadata i64 %outer.coerce1, i64 0, metadata ![[O]], metadata ![[PIECE2:[0-9]+]]),<br>
+; CHECK: call void @llvm.dbg.value({{.*}}, i64 0, metadata ![[I1:[0-9]+]], metadata ![[PIECE3:[0-9]+]]),<br>
+; CHECK-DAG: ![[O]] = {{.*}} [ DW_TAG_arg_variable ] [outer] [line 10]<br>
+; CHECK-DAG: ![[PIECE1]] = {{.*}} [ DW_TAG_expression ] [DW_OP_piece offset=0, size=8]<br>
+; CHECK-DAG: ![[PIECE2]] = {{.*}} [ DW_TAG_expression ] [DW_OP_piece offset=8, size=8]<br>
+; CHECK-DAG: ![[I1]] = {{.*}} [ DW_TAG_auto_variable ] [i1] [line 11]<br>
+; CHECK-DAG: ![[PIECE3]] = {{.*}} [ DW_TAG_expression ] [DW_OP_piece offset=0, size=4]<br>
+<br>
+; ModuleID = 'sroasplit-2.c'<br>
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"<br>
+target triple = "x86_64-apple-macosx10.9.0"<br>
+<br>
+%struct.Outer = type { [2 x %struct.Inner] }<br>
+%struct.Inner = type { i32, i32 }<br>
+<br>
+; Function Attrs: nounwind ssp uwtable<br>
+define i32 @foo(i64 %outer.coerce0, i64 %outer.coerce1) #0 {<br>
+ %outer = alloca %struct.Outer, align 8<br>
+ %i1 = alloca %struct.Inner, align 4<br>
+ %1 = bitcast %struct.Outer* %outer to { i64, i64 }*<br>
+ %2 = getelementptr { i64, i64 }* %1, i32 0, i32 0<br>
+ store i64 %outer.coerce0, i64* %2<br>
+ %3 = getelementptr { i64, i64 }* %1, i32 0, i32 1<br>
+ store i64 %outer.coerce1, i64* %3<br>
+ call void @llvm.dbg.declare(metadata %struct.Outer* %outer, metadata !24, metadata !2), !dbg !25<br>
+ call void @llvm.dbg.declare(metadata %struct.Inner* %i1, metadata !26, metadata !2), !dbg !27<br>
+ %4 = getelementptr inbounds %struct.Outer* %outer, i32 0, i32 0, !dbg !27<br>
+ %5 = getelementptr inbounds [2 x %struct.Inner]* %4, i32 0, i64 1, !dbg !27<br>
+ %6 = bitcast %struct.Inner* %i1 to i8*, !dbg !27<br>
+ %7 = bitcast %struct.Inner* %5 to i8*, !dbg !27<br>
+ call void @llvm.memcpy.p0i8.p0i8.i64(i8* %6, i8* %7, i64 8, i32 4, i1 false), !dbg !27<br>
+ %8 = getelementptr inbounds %struct.Inner* %i1, i32 0, i32 0, !dbg !28<br>
+ %9 = load i32* %8, align 4, !dbg !28<br>
+ ret i32 %9, !dbg !28<br>
+}<br>
+<br>
+; Function Attrs: nounwind readnone<br>
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1<br>
+<br>
+; Function Attrs: nounwind<br>
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture readonly, i64, i32, i1) #2<br>
+<br>
+attributes #0 = { nounwind ssp uwtable "no-frame-pointer-elim"="true" }<br>
+attributes #1 = { nounwind readnone }<br>
+attributes #2 = { nounwind }<br>
+<br>
+!<a href="http://llvm.dbg.cu/" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!21, !22}<br>
+!llvm.ident = !{!23}<br>
+<br>
+!0 = !{!"0x11\0012\00clang version 3.5.0 \000\00\000\00\001", !1, !2, !2, !3, !2, !2} ; [ DW_TAG_compile_unit ] [ DW_TAG_compile_unit ] [sroasplit-2.c] [DW_LANG_C99]<br>
+!1 = !{!"sroasplit-2.c", !""}<br>
+!2 = !{}<br>
+!3 = !{!4}<br>
+!4 = !{!"0x2e\00foo\00foo\00\0010\000\001\000\006\00256\000\0010", !1, !5, !6, null, i32 (i64, i64)* @foo, null, null, !2} ; [ DW_TAG_subprogram ] [ DW_TAG_subprogram ] [line 10] [def] [foo]<br>
+!5 = !{!"0x29", !1} ; [ DW_TAG_file_type ] [ DW_TAG_file_type ] [sroasplit-2.c]<br>
+!6 = !{!"0x15\00\000\000\000\000\000\000", i32 0, null, null, !7, null, null, null} ; [ DW_TAG_subroutine_type ] [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!7 = !{!8, !9}<br>
+!8 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
+!9 = !{!"0x16\00Outer\008\000\000\000\000", !1, null, !10} ; [ DW_TAG_typedef ] [ DW_TAG_typedef ] [Outer] [line 8, size 0, align 0, offset 0] [from ]<br>
+!10 = !{!"0x13\00\006\00128\0032\000\000\000", !1, null, null, !11, null, null, null} ; [ DW_TAG_structure_type ] [line 6, size 128, align 32, offset 0] [def] [from ]<br>
+!11 = !{!12}<br>
+!12 = !{!"0xd\00inner\007\00128\0032\000\000", !1, !10, !13} ; [ DW_TAG_member ] [inner] [line 7, size 128, align 32, offset 0] [from ]<br>
+!13 = !{!"0x1\00\000\00128\0032\000\000", null, null, !14, !19, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 128, align 32, offset 0] [from Inner]<br>
+!14 = !{!"0x16\00Inner\004\000\000\000\000", !1, null, !15} ; [ DW_TAG_typedef ] [ DW_TAG_typedef ] [Inner] [line 4, size 0, align 0, offset 0] [from ]<br>
+!15 = !{!"0x13\00\001\0064\0032\000\000\000", !1, null, null, !16, null, null, null} ; [ DW_TAG_structure_type ] [line 1, size 64, align 32, offset 0] [def] [from ]<br>
+!16 = !{!17, !18}<br>
+!17 = !{!"0xd\00a\002\0032\0032\000\000", !1, !15, !8} ; [ DW_TAG_member ] [a] [line 2, size 32, align 32, offset 0] [from int]<br>
+!18 = !{!"0xd\00b\003\0032\0032\0032\000", !1, !15, !8} ; [ DW_TAG_member ] [b] [line 3, size 32, align 32, offset 32] [from int]<br>
+!19 = !{!20}<br>
+!20 = !{!"0x21\000\002"} ; [ DW_TAG_subrange_type ] [0, 1]<br>
+!21 = !{i32 2, !"Dwarf Version", i32 2}<br>
+!22 = !{i32 1, !"Debug Info Version", i32 2}<br>
+!23 = !{!"clang version 3.5.0 "}<br>
+!24 = !{!"0x101\00outer\0016777226\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [ DW_TAG_arg_variable ] [outer] [line 10]<br>
+!25 = !{i32 10, i32 0, !4, null}<br>
+!26 = !{!"0x100\00i1\0011\000", !4, !5, !14} ; [ DW_TAG_auto_variable ] [ DW_TAG_auto_variable ] [i1] [line 11]<br>
+!27 = !{i32 11, i32 0, !4, null}<br>
+!28 = !{i32 12, i32 0, !4, null}<br>
<br>
Added: llvm/trunk/test/DebugInfo/X86/sroasplit-3.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/sroasplit-3.ll?rev=225379&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/sroasplit-3.ll?rev=225379&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/sroasplit-3.ll (added)<br>
+++ llvm/trunk/test/DebugInfo/X86/sroasplit-3.ll Wed Jan 7 14:52:22 2015<br>
@@ -0,0 +1,63 @@<br>
+; RUN: opt %s -sroa -verify -S -o - | FileCheck %s<br>
+; ModuleID = 'test.c'<br>
+; Test that SROA updates the debug info correctly if an alloca was rewritten but<br>
+; not partitioned into multiple allocas.<br>
+;<br>
+; CHECK: call void @llvm.dbg.value(metadata float %s.coerce, i64 0, metadata ![[VAR:[0-9]+]], metadata ![[EXPR:[0-9]+]])<br>
+; CHECK: ![[VAR]] = {{.*}} [ DW_TAG_arg_variable ] [s] [line 3]<br>
+; CHECK: ![[EXPR]] = {{.*}} [ DW_TAG_expression ]<br>
+; CHECK-NOT: DW_OP_piece<br>
+<br>
+;<br>
+; struct S { float f; };<br>
+;<br>
+; float foo(struct S s) {<br>
+; return s.f;<br>
+; }<br>
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"<br>
+target triple = "x86_64-apple-macosx10.10.0"<br>
+<br>
+%struct.S = type { float }<br>
+<br>
+; Function Attrs: nounwind ssp uwtable<br>
+define float @foo(float %s.coerce) #0 {<br>
+entry:<br>
+ %s = alloca %struct.S, align 4<br>
+ %coerce.dive = getelementptr %struct.S* %s, i32 0, i32 0<br>
+ store float %s.coerce, float* %coerce.dive, align 1<br>
+ call void @llvm.dbg.declare(metadata %struct.S* %s, metadata !16, metadata !17), !dbg !18<br>
+ %f = getelementptr inbounds %struct.S* %s, i32 0, i32 0, !dbg !19<br>
+ %0 = load float* %f, align 4, !dbg !19<br>
+ ret float %0, !dbg !19<br>
+}<br>
+<br>
+; Function Attrs: nounwind readnone<br>
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1<br>
+<br>
+attributes #0 = { nounwind ssp uwtable }<br>
+attributes #1 = { nounwind readnone }<br>
+<br>
+!<a href="http://llvm.dbg.cu/" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!12, !13, !14}<br>
+!llvm.ident = !{!15}<br>
+<br>
+!0 = !{!"0x11\0012\00clang version 3.6.0 \000\00\000\00\001", !1, !2, !2, !3, !2, !2} ; [ DW_TAG_compile_unit ] [/Volumes/Data/llvm/_build.ninja.debug/test.c] [DW_LANG_C99]<br>
+!1 = !{!"test.c", !"/Volumes/Data/llvm/_build.ninja.debug"}<br>
+!2 = !{}<br>
+!3 = !{!4}<br>
+!4 = !{!"0x2e\00foo\00foo\00\003\000\001\000\000\00256\000\003", !1, !5, !6, null, float (float)* @foo, null, null, !2} ; [ DW_TAG_subprogram ] [line 3] [def] [foo]<br>
+!5 = !{!"0x29", !1} ; [ DW_TAG_file_type ] [/Volumes/Data/llvm/_build.ninja.debug/test.c]<br>
+!6 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !7, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!7 = !{!8, !9}<br>
+!8 = !{!"0x24\00float\000\0032\0032\000\000\004", null, null} ; [ DW_TAG_base_type ] [float] [line 0, size 32, align 32, offset 0, enc DW_ATE_float]<br>
+!9 = !{!"0x13\00S\001\0032\0032\000\000\000", !1, null, null, !10, null, null, null} ; [ DW_TAG_structure_type ] [S] [line 1, size 32, align 32, offset 0] [def] [from ]<br>
+!10 = !{!11}<br>
+!11 = !{!"0xd\00f\001\0032\0032\000\000", !1, !9, !8} ; [ DW_TAG_member ] [f] [line 1, size 32, align 32, offset 0] [from float]<br>
+!12 = !{i32 2, !"Dwarf Version", i32 2}<br>
+!13 = !{i32 2, !"Debug Info Version", i32 2}<br>
+!14 = !{i32 1, !"PIC Level", i32 2}<br>
+!15 = !{!"clang version 3.6.0 "}<br>
+!16 = !{!"0x101\00s\0016777219\000", !4, !5, !9} ; [ DW_TAG_arg_variable ] [s] [line 3]<br>
+!17 = !{!"0x102"} ; [ DW_TAG_expression ]<br>
+!18 = !{i32 3, i32 20, !4, null}<br>
+!19 = !{i32 4, i32 2, !4, null}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div>
</div></blockquote></div></div></div><br></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div>