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