<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Nov 12, 2014 at 7:20 PM, Frederic Riss <span dir="ltr"><<a href="mailto:friss@apple.com" target="_blank">friss@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: friss<br>
Date: Wed Nov 12 21:20:23 2014<br>
New Revision: 221854<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=221854&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=221854&view=rev</a><br>
Log:<br>
Add an assert and a test that verify r221709's fix.<br>
<br>
Added:<br>
llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll<br>
Modified:<br>
llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp<br>
<br>
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=221854&r1=221853&r2=221854&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=221854&r1=221853&r2=221854&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Wed Nov 12 21:20:23 2014<br>
@@ -6152,9 +6152,11 @@ unsigned SelectionDAG::AssignTopological<br>
/// AddDbgValue - Add a dbg_value SDNode. If SD is non-null that means the<br>
/// value is produced by SD.<br>
void SelectionDAG::AddDbgValue(SDDbgValue *DB, SDNode *SD, bool isParameter) {<br>
- DbgInfo->add(DB, SD, isParameter);<br>
- if (SD)<br>
+ if (SD) {<br>
+ assert(DbgInfo->getSDDbgValues(SD).empty() || SD->getHasDebugValue());<br></blockquote><div><br></div><div>We could make this assertion a bit tighter by using ^ instead of ||, perhaps? (it shouldn't be empty and have debug value, right?)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
SD->setHasDebugValue(true);<br>
+ }<br>
+ DbgInfo->add(DB, SD, isParameter);<br>
}<br>
<br>
/// TransferDbgValues - Transfer SDDbgValues.<br>
<br>
Added: llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll?rev=221854&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll?rev=221854&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll (added)<br>
+++ llvm/trunk/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll Wed Nov 12 21:20:23 2014<br>
@@ -0,0 +1,105 @@<br>
+; REQUIRES: object-emission<br>
+<br>
+; RUN: llc -mtriple=x86_64-apple-macosx10.10.0 -o %t %s<br>
+<br>
+; Testcase generated from:<br>
+; #include <stdint.h><br>
+; int foo(int a) {<br>
+; int b = (int16_t)a + 8;<br>
+; int c = (int16_t)b + 8;<br>
+; int d = (int16_t)c + 8;<br>
+; int e = (int16_t)d + 8;<br>
+; int f = (int16_t)e + 8;<br>
+; return f;<br>
+; }<br>
+; by emitting the IR and then manually applying mem2reg to it.<br>
+<br>
+; This testcase would trigger the assert commited along with it if the<br>
+; fix of r221709 isn't applied. There is no other check except the successful<br>
+; run of llc.<br>
+; What happened before r221709, is that SDDbgInfo (the data structure helping<br>
+; SelectionDAG to keep track of dbg.values) kept a map keyed by SDNode pointers.<br>
+; This map was never purged when the SDNodes were deallocated and thus if a new<br>
+; SDNode was allocated in the same memory, it would have an entry in the SDDbgInfo<br>
+; map upon creation (Reallocation in the same memory can happen easily as<br>
+; SelectionDAG uses a Recycling allocator). This behavior could turn into a<br>
+; pathological memory consumption explosion if the DAG combiner hit the 'right'<br>
+; allocation patterns as could be seen in PR20893.<br>
+; By nature, this test could bitrot quite easily. If it doesn't trigger an assert<br>
+; when run with r221709 reverted, then it really doesn't test anything anymore.<br>
+<br>
+; Function Attrs: nounwind ssp uwtable<br>
+define i32 @foo(i32 %a) #0 {<br>
+entry:<br>
+ call void @llvm.dbg.value(metadata !{i32 %a}, i64 0, metadata !16, metadata !17), !dbg !18<br>
+ %conv = trunc i32 %a to i16, !dbg !19<br>
+ %conv1 = sext i16 %conv to i32, !dbg !19<br>
+ %add = add nsw i32 %conv1, 8, !dbg !19<br>
+ call void @llvm.dbg.value(metadata !{i32 %add}, i64 0, metadata !20, metadata !17), !dbg !21<br>
+ %conv2 = trunc i32 %add to i16, !dbg !22<br>
+ %conv3 = sext i16 %conv2 to i32, !dbg !22<br>
+ %add4 = add nsw i32 %conv3, 8, !dbg !22<br>
+ call void @llvm.dbg.value(metadata !{i32 %add4}, i64 0, metadata !23, metadata !17), !dbg !24<br>
+ %conv5 = trunc i32 %add4 to i16, !dbg !25<br>
+ %conv6 = sext i16 %conv5 to i32, !dbg !25<br>
+ %add7 = add nsw i32 %conv6, 8, !dbg !25<br>
+ call void @llvm.dbg.value(metadata !{i32 %add7}, i64 0, metadata !26, metadata !17), !dbg !27<br>
+ %conv8 = trunc i32 %add7 to i16, !dbg !28<br>
+ %conv9 = sext i16 %conv8 to i32, !dbg !28<br>
+ %add10 = add nsw i32 %conv9, 8, !dbg !28<br>
+ call void @llvm.dbg.value(metadata !{i32 %add10}, i64 0, metadata !29, metadata !17), !dbg !30<br>
+ %conv11 = trunc i32 %add10 to i16, !dbg !31<br>
+ %conv12 = sext i16 %conv11 to i32, !dbg !31<br>
+ %add13 = add nsw i32 %conv12, 8, !dbg !31<br>
+ call void @llvm.dbg.value(metadata !{i32 %add13}, i64 0, metadata !32, metadata !17), !dbg !33<br>
+ ret i32 %add13, !dbg !34<br>
+}<br>
+<br>
+; Function Attrs: nounwind readnone<br>
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1<br>
+<br>
+; Function Attrs: nounwind readnone<br>
+declare void @llvm.dbg.value(metadata, i64, metadata, metadata) #1<br>
+<br>
+attributes #0 = { nounwind ssp uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }<br>
+attributes #1 = { nounwind readnone }<br>
+<br>
+!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!13, !14}<br>
+!llvm.ident = !{!15}<br>
+<br>
+!0 = metadata !{metadata !"0x11\0012\00clang version 3.6.0 \000\00\000\00\001", metadata !1, metadata !2, metadata !3, metadata !7, metadata !2, metadata !2} ; [ DW_TAG_compile_unit ] [/tmp/ghost-sdnode-dbgvalues.c] [DW_LANG_C99]<br>
+!1 = metadata !{metadata !"ghost-sdnode-dbgvalues.c", metadata !"/tmp"}<br>
+!2 = metadata !{}<br>
+!3 = metadata !{metadata !4}<br>
+!4 = metadata !{metadata !"0x16\00int16_t\0030\000\000\000\000", metadata !5, null, metadata !6} ; [ DW_TAG_typedef ] [int16_t] [line 30, size 0, align 0, offset 0] [from short]<br>
+!5 = metadata !{metadata !"/usr/include/sys/_types/_int16_t.h", metadata !"/tmp"}<br>
+!6 = metadata !{metadata !"0x24\00short\000\0016\0016\000\000\005", null, null} ; [ DW_TAG_base_type ] [short] [line 0, size 16, align 16, offset 0, enc DW_ATE_signed]<br>
+!7 = metadata !{metadata !8}<br>
+!8 = metadata !{metadata !"0x2e\00foo\00foo\00\003\000\001\000\000\00256\000\003", metadata !1, metadata !9, metadata !10, null, i32 (i32)* @foo, null, null, metadata !2} ; [ DW_TAG_subprogram ] [line 3] [def] [foo]<br>
+!9 = metadata !{metadata !"0x29", metadata !1} ; [ DW_TAG_file_type ] [/tmp/ghost-sdnode-dbgvalues.c]<br>
+!10 = metadata !{metadata !"0x15\00\000\000\000\000\000\000", null, null, null, metadata !11, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!11 = metadata !{metadata !12, metadata !12}<br>
+!12 = metadata !{metadata !"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>
+!13 = metadata !{i32 2, metadata !"Dwarf Version", i32 2}<br>
+!14 = metadata !{i32 2, metadata !"Debug Info Version", i32 2}<br>
+!15 = metadata !{metadata !"clang version 3.6.0 "}<br>
+!16 = metadata !{metadata !"0x101\00a\0016777219\000", metadata !8, metadata !9, metadata !12} ; [ DW_TAG_arg_variable ] [a] [line 3]<br>
+!17 = metadata !{metadata !"0x102"} ; [ DW_TAG_expression ]<br>
+!18 = metadata !{i32 3, i32 13, metadata !8, null}<br>
+!19 = metadata !{i32 4, i32 5, metadata !8, null}<br>
+!20 = metadata !{metadata !"0x100\00b\004\000", metadata !8, metadata !9, metadata !12} ; [ DW_TAG_auto_variable ] [b] [line 4]<br>
+!21 = metadata !{i32 4, i32 9, metadata !8, null}<br>
+!22 = metadata !{i32 5, i32 5, metadata !8, null}<br>
+!23 = metadata !{metadata !"0x100\00c\005\000", metadata !8, metadata !9, metadata !12} ; [ DW_TAG_auto_variable ] [c] [line 5]<br>
+!24 = metadata !{i32 5, i32 9, metadata !8, null}<br>
+!25 = metadata !{i32 6, i32 5, metadata !8, null}<br>
+!26 = metadata !{metadata !"0x100\00d\006\000", metadata !8, metadata !9, metadata !12} ; [ DW_TAG_auto_variable ] [d] [line 6]<br>
+!27 = metadata !{i32 6, i32 9, metadata !8, null}<br>
+!28 = metadata !{i32 7, i32 5, metadata !8, null}<br>
+!29 = metadata !{metadata !"0x100\00e\007\000", metadata !8, metadata !9, metadata !12} ; [ DW_TAG_auto_variable ] [e] [line 7]<br>
+!30 = metadata !{i32 7, i32 9, metadata !8, null}<br>
+!31 = metadata !{i32 8, i32 5, metadata !8, null}<br>
+!32 = metadata !{metadata !"0x100\00f\008\000", metadata !8, metadata !9, metadata !12} ; [ DW_TAG_auto_variable ] [f] [line 8]<br>
+!33 = metadata !{i32 8, i32 9, metadata !8, null}<br>
+!34 = metadata !{i32 9, i32 5, metadata !8, null}<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>
</blockquote></div><br></div></div>