<div dir="ltr">Works for me, thanks!</div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jan 30, 2015 at 11:39 AM, 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">Should be fixed in r227604.<br>
<span class="HOEnZb"><font color="#888888"><br>
-- adrian<br>
</font></span><div class="HOEnZb"><div class="h5">> On Jan 30, 2015, at 10:40 AM, Adrian Prantl <<a href="mailto:aprantl@apple.com">aprantl@apple.com</a>> wrote:<br>
><br>
> I’m having trouble with compiling this on Darwin — could you maybe send me the preprocessed source off-list?<br>
><br>
> -- adrian<br>
><br>
>> On Jan 30, 2015, at 10:26 AM, Alexey Samsonov <<a href="mailto:vonosmas@gmail.com">vonosmas@gmail.com</a>> wrote:<br>
>><br>
>> FYI this change causes either an infinite loop, or terrible slowdown here:<br>
>><br>
>> #1 0x0000000002660cb4 in llvm::InlineFunction(llvm::CallSite, llvm::InlineFunctionInfo&, bool) ()<br>
>> #2 0x0000000001905fff in InlineCallIfPossible(llvm::CallSite, llvm::InlineFunctionInfo&, llvm::DenseMap<llvm::Arra<br>
>> yType*, std::vector<llvm::AllocaInst*, std::allocator<llvm::AllocaInst*> >, llvm::DenseMapInfo<llvm::ArrayType*>, l<br>
>> lvm::detail::DenseMapPair<llvm::ArrayType*, std::vector<llvm::AllocaInst*, std::allocator<llvm::AllocaInst*> > > >&<br>
>> , int, bool, llvm::DataLayout const*) ()<br>
>> #3 0x0000000001908568 in llvm::Inliner::runOnSCC(llvm::CallGraphSCC&) ()<br>
>><br>
>> Here's how you can reproduce this:<br>
>> $ cd project/compiler-rt/lib/tsan/rtl<br>
>> $ clang++ -std=c++11 -fPIE -g -Wall -Werror -fno-builtin -msse3 -DSANITIZER_DEBUG=1 -fno-exceptions -fno-rtti -Wglobal-constructors -I../.. -I../../../include --sysroot=. -c tsan_interceptors.cc -o /tmp/a.o<br>
>><br>
>><br>
>><br>
>> On Thu, Jan 29, 2015 at 5:55 PM, Adrian Prantl <<a href="mailto:aprantl@apple.com">aprantl@apple.com</a>> wrote:<br>
>> Author: adrian<br>
>> Date: Thu Jan 29 19:55:25 2015<br>
>> New Revision: 227544<br>
>><br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=227544&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=227544&view=rev</a><br>
>> Log:<br>
>> Fix PR22386. The inliner moves static allocas to the entry basic block<br>
>> so we need to move the dbg.declare intrinsics that describe them, too.<br>
>><br>
>> Added:<br>
>> llvm/trunk/test/Transforms/Inline/alloca-dbgdeclare.ll<br>
>> Modified:<br>
>> llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp<br>
>><br>
>> Modified: llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp?rev=227544&r1=227543&r2=227544&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp?rev=227544&r1=227543&r2=227544&view=diff</a><br>
>> ==============================================================================<br>
>> --- llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp (original)<br>
>> +++ llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp Thu Jan 29 19:55:25 2015<br>
>> @@ -1111,6 +1111,14 @@ bool llvm::InlineFunction(CallSite CS, I<br>
>> FirstNewBlock->getInstList(),<br>
>> AI, I);<br>
>> }<br>
>> + // Move any dbg.declares describing the allocas into the entry basic block.<br>
>> + for (auto &I : IFI.StaticAllocas)<br>
>> + if (auto AI = dyn_cast<AllocaInst>(I))<br>
>> + if (auto *DDI = FindAllocaDbgDeclare(AI))<br>
>> + if (DDI->getParent() != Caller->begin())<br>
>> + Caller->getEntryBlock().getInstList()<br>
>> + .splice(AI->getNextNode(), FirstNewBlock->getInstList(),<br>
>> + DDI, DDI->getNextNode());<br>
>> }<br>
>><br>
>> bool InlinedMustTailCalls = false;<br>
>><br>
>> Added: llvm/trunk/test/Transforms/Inline/alloca-dbgdeclare.ll<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/alloca-dbgdeclare.ll?rev=227544&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/alloca-dbgdeclare.ll?rev=227544&view=auto</a><br>
>> ==============================================================================<br>
>> --- llvm/trunk/test/Transforms/Inline/alloca-dbgdeclare.ll (added)<br>
>> +++ llvm/trunk/test/Transforms/Inline/alloca-dbgdeclare.ll Thu Jan 29 19:55:25 2015<br>
>> @@ -0,0 +1,141 @@<br>
>> +; RUN: opt -inline -S < %s | FileCheck %s<br>
>> +; struct A {<br>
>> +; int arg0;<br>
>> +; double arg1[2];<br>
>> +; } a, b;<br>
>> +;<br>
>> +; void fn3(A p1) {<br>
>> +; if (p1.arg0)<br>
>> +; a = p1;<br>
>> +; }<br>
>> +;<br>
>> +; void fn4() { fn3(b); }<br>
>> +;<br>
>> +; void fn5() {<br>
>> +; while (1)<br>
>> +; fn4();<br>
>> +; }<br>
>> +; ModuleID = 'test.cpp'<br>
>> +target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"<br>
>> +target triple = "aarch64-apple-darwin"<br>
>> +<br>
>> +%struct.A = type { i32, [2 x double] }<br>
>> +<br>
>> +@a = global %struct.A zeroinitializer, align 8<br>
>> +@b = global %struct.A zeroinitializer, align 8<br>
>> +<br>
>> +; Function Attrs: nounwind<br>
>> +declare void @_Z3fn31A(%struct.A* nocapture readonly %p1) #0<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>
>> +; Function Attrs: nounwind<br>
>> +define void @_Z3fn4v() #0 {<br>
>> +entry:<br>
>> +; Test that the dbg.declare is moved together with the alloca.<br>
>> +; CHECK: define void @_Z3fn5v()<br>
>> +; CHECK-NEXT: entry:<br>
>> +; CHECK-NEXT: %agg.tmp.sroa.3.i = alloca [20 x i8], align 4<br>
>> +; CHECK-NEXT: tail call void @llvm.dbg.declare(metadata [20 x i8]* %agg.tmp.sroa.3.i,<br>
>> + %agg.tmp.sroa.3 = alloca [20 x i8], align 4<br>
>> + tail call void @llvm.dbg.declare(metadata [20 x i8]* %agg.tmp.sroa.3, metadata !46, metadata !48), !dbg !49<br>
>> + %agg.tmp.sroa.0.0.copyload = load i32* getelementptr inbounds (%struct.A* @b, i64 0, i32 0), align 8, !dbg !50<br>
>> + tail call void @llvm.dbg.value(metadata i32 %agg.tmp.sroa.0.0.copyload, i64 0, metadata !46, metadata !51), !dbg !49<br>
>> + %agg.tmp.sroa.3.0..sroa_idx = getelementptr inbounds [20 x i8]* %agg.tmp.sroa.3, i64 0, i64 0, !dbg !50<br>
>> + call void @llvm.memcpy.p0i8.p0i8.i64(i8* %agg.tmp.sroa.3.0..sroa_idx, i8* getelementptr (i8* bitcast (%struct.A* @b to i8*), i64 4), i64 20, i32 4, i1 false), !dbg !50<br>
>> + tail call void @llvm.dbg.declare(metadata %struct.A* undef, metadata !46, metadata !31) #2, !dbg !49<br>
>> + %tobool.i = icmp eq i32 %agg.tmp.sroa.0.0.copyload, 0, !dbg !52<br>
>> + br i1 %tobool.i, label %_Z3fn31A.exit, label %if.then.i, !dbg !53<br>
>> +<br>
>> +if.then.i: ; preds = %entry<br>
>> + store i32 %agg.tmp.sroa.0.0.copyload, i32* getelementptr inbounds (%struct.A* @a, i64 0, i32 0), align 8, !dbg !54<br>
>> + call void @llvm.memcpy.p0i8.p0i8.i64(i8* getelementptr (i8* bitcast (%struct.A* @a to i8*), i64 4), i8* %agg.tmp.sroa.3.0..sroa_idx, i64 20, i32 4, i1 false), !dbg !54<br>
>> + br label %_Z3fn31A.exit, !dbg !54<br>
>> +<br>
>> +_Z3fn31A.exit: ; preds = %entry, %if.then.i<br>
>> + ret void, !dbg !50<br>
>> +}<br>
>> +<br>
>> +; Function Attrs: noreturn nounwind<br>
>> +define void @_Z3fn5v() #3 {<br>
>> +entry:<br>
>> + br label %while.body, !dbg !55<br>
>> +<br>
>> +while.body: ; preds = %entry, %while.body<br>
>> + call void @_Z3fn4v(), !dbg !56<br>
>> + br label %while.body, !dbg !55<br>
>> +}<br>
>> +<br>
>> +; Function Attrs: nounwind readnone<br>
>> +declare void @llvm.dbg.value(metadata, i64, metadata, metadata) #1<br>
>> +<br>
>> +attributes #0 = { nounwind }<br>
>> +attributes #1 = { nounwind readnone }<br>
>> +attributes #2 = { nounwind }<br>
>> +attributes #3 = { noreturn nounwind }<br>
>> +<br>
>> +!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
>> +!llvm.module.flags = !{!28, !29}<br>
>> +!llvm.ident = !{!30}<br>
>> +<br>
>> +!0 = !{!"0x11\004\00clang version 3.7.0 (trunk 227480) (llvm/trunk 227517)\001\00\000\00\001", !1, !2, !3, !14, !25, !2} ; [ DW_TAG_compile_unit ] [/<stdin>] [DW_LANG_C_plus_plus]<br>
>> +!1 = !{!"<stdin>", !""}<br>
>> +!2 = !{}<br>
>> +!3 = !{!4}<br>
>> +!4 = !{!"0x13\00A\001\00192\0064\000\000\000", !5, null, null, !6, null, null, !"_ZTS1A"} ; [ DW_TAG_structure_type ] [A] [line 1, size 192, align 64, offset 0] [def] [from ]<br>
>> +!5 = !{!"test.cpp", !""}<br>
>> +!6 = !{!7, !9}<br>
>> +!7 = !{!"0xd\00arg0\002\0032\0032\000\000", !5, !"_ZTS1A", !8} ; [ DW_TAG_member ] [arg0] [line 2, size 32, align 32, offset 0] [from int]<br>
>> +!8 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
>> +!9 = !{!"0xd\00arg1\003\00128\0064\0064\000", !5, !"_ZTS1A", !10} ; [ DW_TAG_member ] [arg1] [line 3, size 128, align 64, offset 64] [from ]<br>
>> +!10 = !{!"0x1\00\000\00128\0064\000\000\000", null, null, !11, !12, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 128, align 64, offset 0] [from double]<br>
>> +!11 = !{!"0x24\00double\000\0064\0064\000\000\004", null, null} ; [ DW_TAG_base_type ] [double] [line 0, size 64, align 64, offset 0, enc DW_ATE_float]<br>
>> +!12 = !{!13}<br>
>> +!13 = !{!"0x21\000\002"} ; [ DW_TAG_subrange_type ] [0, 1]<br>
>> +!14 = !{!15, !21, !24}<br>
>> +!15 = !{!"0x2e\00fn3\00fn3\00_Z3fn31A\006\000\001\000\000\00256\001\006", !5, !16, !17, null, void (%struct.A*)* @_Z3fn31A, null, null, !19} ; [ DW_TAG_subprogram ] [line 6] [def] [fn3]<br>
>> +!16 = !{!"0x29", !5} ; [ DW_TAG_file_type ] [/test.cpp]<br>
>> +!17 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !18, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
>> +!18 = !{null, !"_ZTS1A"}<br>
>> +!19 = !{!20}<br>
>> +!20 = !{!"0x101\00p1\0016777222\000", !15, !16, !"_ZTS1A"} ; [ DW_TAG_arg_variable ] [p1] [line 6]<br>
>> +!21 = !{!"0x2e\00fn4\00fn4\00_Z3fn4v\0011\000\001\000\000\00256\001\0011", !5, !16, !22, null, void ()* @_Z3fn4v, null, null, !2} ; [ DW_TAG_subprogram ] [line 11] [def] [fn4]<br>
>> +!22 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !23, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
>> +!23 = !{null}<br>
>> +!24 = !{!"0x2e\00fn5\00fn5\00_Z3fn5v\0013\000\001\000\000\00256\001\0013", !5, !16, !22, null, void ()* @_Z3fn5v, null, null, !2} ; [ DW_TAG_subprogram ] [line 13] [def] [fn5]<br>
>> +!25 = !{!26, !27}<br>
>> +!26 = !{!"0x34\00a\00a\00\004\000\001", null, !16, !"_ZTS1A", %struct.A* @a, null} ; [ DW_TAG_variable ] [a] [line 4] [def]<br>
>> +!27 = !{!"0x34\00b\00b\00\004\000\001", null, !16, !"_ZTS1A", %struct.A* @b, null} ; [ DW_TAG_variable ] [b] [line 4] [def]<br>
>> +!28 = !{i32 2, !"Dwarf Version", i32 4}<br>
>> +!29 = !{i32 2, !"Debug Info Version", i32 2}<br>
>> +!30 = !{!"clang version 3.7.0 (trunk 227480) (llvm/trunk 227517)"}<br>
>> +!31 = !{!"0x102\006"} ; [ DW_TAG_expression ] [DW_OP_deref]<br>
>> +!32 = !MDLocation(line: 6, scope: !15)<br>
>> +!33 = !MDLocation(line: 7, scope: !34)<br>
>> +!34 = !{!"0xb\007\000\000", !5, !15} ; [ DW_TAG_lexical_block ] [/test.cpp]<br>
>> +!35 = !{!36, !37, i64 0}<br>
>> +!36 = !{!"_ZTS1A", !37, i64 0, !38, i64 8}<br>
>> +!37 = !{!"int", !38, i64 0}<br>
>> +!38 = !{!"omnipotent char", !39, i64 0}<br>
>> +!39 = !{!"Simple C/C++ TBAA"}<br>
>> +!40 = !MDLocation(line: 7, scope: !15)<br>
>> +!41 = !MDLocation(line: 8, scope: !34)<br>
>> +!42 = !{i64 0, i64 4, !43, i64 8, i64 16, !44}<br>
>> +!43 = !{!37, !37, i64 0}<br>
>> +!44 = !{!38, !38, i64 0}<br>
>> +!45 = !MDLocation(line: 9, scope: !15)<br>
>> +!46 = !{!"0x101\00p1\0016777222\000", !15, !16, !"_ZTS1A", !47} ; [ DW_TAG_arg_variable ] [p1] [line 6]<br>
>> +!47 = distinct !MDLocation(line: 11, scope: !21)<br>
>> +!48 = !{!"0x102\00147\004\0020"} ; [ DW_TAG_expression ] [DW_OP_piece offset=4, size=20]<br>
>> +!49 = !MDLocation(line: 6, scope: !15, inlinedAt: !47)<br>
>> +!50 = !MDLocation(line: 11, scope: !21)<br>
>> +!51 = !{!"0x102\00147\000\004"} ; [ DW_TAG_expression ] [DW_OP_piece offset=0, size=4]<br>
>> +!52 = !MDLocation(line: 7, scope: !34, inlinedAt: !47)<br>
>> +!53 = !MDLocation(line: 7, scope: !15, inlinedAt: !47)<br>
>> +!54 = !MDLocation(line: 8, scope: !34, inlinedAt: !47)<br>
>> +!55 = !MDLocation(line: 14, scope: !24)<br>
>> +!56 = !MDLocation(line: 15, scope: !24)<br>
>><br>
>><br>
>> _______________________________________________<br>
>> llvm-commits mailing list<br>
>> <a href="mailto:llvm-commits@cs.uiuc.edu">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>
>><br>
>><br>
>><br>
>> --<br>
>> Alexey Samsonov<br>
>> <a href="mailto:vonosmas@gmail.com">vonosmas@gmail.com</a><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">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>
<br>
</div></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>