Skip to content

Commit a481787

Browse files
committedNov 7, 2014
Safely generate new loop metadata node
Polly was accidently modifying a debug info metadata node when attempting to generate a new unique metadata node for the loop id. The problem was that we had dwarf metadata that referred to a metadata node with a null value, like this: !6 = ... some dwarf metadata referring to !7 ... !7 = {null} When we attempt to generate a new metadata node, we reserve the first space for self-referential node by setting the first argument to null and then mutating the node later to refer to itself. However, because the nodes are uniqued based on pointer values, when we get the new metadata node it actually referred to an existing node (!7 in the example). When we went to modify the metadata to point to itself, we were accidently mutating the dwarf metatdata. We ended up in this situation: !6 = ... some dwarf metadata referring to !7 ... !7 = {!7} and this causes an assert when generating the debug info. The fix is simple, we just need to use a unique value when getting a new metadata node. The MDNode::getTemporary() provides exactly the API we need (and it is used in clang to generate the unique nodes). Differential Revision: http://reviews.llvm.org/D6174 llvm-svn: 221550
1 parent 47ee339 commit a481787

File tree

2 files changed

+76
-1
lines changed

2 files changed

+76
-1
lines changed
 

‎polly/lib/CodeGen/IRBuilder.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ static MDNode *getID(LLVMContext &Ctx, Value *arg0 = nullptr,
3434
Value *arg1 = nullptr) {
3535
MDNode *ID;
3636
SmallVector<Value *, 3> Args;
37-
Args.push_back(nullptr);
37+
// Use a temporary node to safely create a unique pointer for the first arg.
38+
MDNode *TempNode = MDNode::getTemporary(Ctx, None);
39+
// Reserve operand 0 for loop id self reference.
40+
Args.push_back(TempNode);
3841

3942
if (arg0)
4043
Args.push_back(arg0);
@@ -43,6 +46,7 @@ static MDNode *getID(LLVMContext &Ctx, Value *arg0 = nullptr,
4346

4447
ID = MDNode::get(Ctx, Args);
4548
ID->replaceOperandWith(0, ID);
49+
MDNode::deleteTemporary(TempNode);
4650
return ID;
4751
}
4852

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
; This test checks that we do not accidently mutate the debug info when
2+
; inserting loop parallel metadata.
3+
; RUN: opt %loadPolly < %s -S -polly -polly-codegen-isl -polly-ast-detect-parallel | FileCheck %s
4+
; CHECK-NOT: !7 = metadata !{metadata !7}
5+
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
6+
target triple = "x86_64-unknown-linux-gnu"
7+
8+
@A = common global i32* null, align 8
9+
10+
; Function Attrs: nounwind uwtable
11+
define void @foo() {
12+
entry:
13+
tail call void @llvm.dbg.value(metadata !18, i64 0, metadata !9, metadata !19), !dbg !20
14+
%0 = load i32** @A, align 8, !dbg !21, !tbaa !23
15+
br label %for.body, !dbg !27
16+
17+
for.body: ; preds = %for.body, %entry
18+
%indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]
19+
%arrayidx = getelementptr inbounds i32* %0, i64 %indvars.iv, !dbg !21
20+
%1 = load i32* %arrayidx, align 4, !dbg !21, !tbaa !30
21+
%add = add nsw i32 %1, 1, !dbg !21
22+
store i32 %add, i32* %arrayidx, align 4, !dbg !21, !tbaa !30
23+
%indvars.iv.next = add nuw nsw i64 %indvars.iv, 1, !dbg !27
24+
%exitcond = icmp eq i64 %indvars.iv, 1, !dbg !27
25+
br i1 %exitcond, label %for.end, label %for.body, !dbg !27
26+
27+
for.end: ; preds = %for.body
28+
ret void, !dbg !32
29+
}
30+
31+
; Function Attrs: nounwind readnone
32+
declare void @llvm.dbg.value(metadata, i64, metadata, metadata)
33+
34+
35+
!llvm.dbg.cu = !{!0}
36+
!llvm.module.flags = !{!15, !16}
37+
!llvm.ident = !{!17}
38+
39+
!0 = metadata !{metadata !"0x11\0012\00clang version 3.6.0 \001\00\000\00\001", metadata !1, metadata !2, metadata !2, metadata !3, metadata !12, metadata !2} ; [ DW_TAG_compile_unit ] [/local/mnt/workspace/build/tip-Release/t2.c] [DW_LANG_C99]
40+
!1 = metadata !{metadata !"t2.c", metadata !"/local/mnt/workspace/build/tip-Release"}
41+
!2 = metadata !{}
42+
!3 = metadata !{metadata !4}
43+
!4 = metadata !{metadata !"0x2e\00foo\00foo\00\003\000\001\000\000\000\001\003", metadata !1, metadata !5, metadata !6, null, void ()* @foo, null, null, metadata !8} ; [ DW_TAG_subprogram ] [line 3] [def] [foo]
44+
!5 = metadata !{metadata !"0x29", metadata !1} ; [ DW_TAG_file_type ] [/local/mnt/workspace/build/tip-Release/t2.c]
45+
!6 = metadata !{metadata !"0x15\00\000\000\000\000\000\000", null, null, null, metadata !7, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
46+
!7 = metadata !{null}
47+
!8 = metadata !{metadata !9}
48+
!9 = metadata !{metadata !"0x100\00i\004\000", metadata !10, metadata !5, metadata !11} ; [ DW_TAG_auto_variable ] [i] [line 4]
49+
!10 = metadata !{metadata !"0xb\004\003\000", metadata !1, metadata !4} ; [ DW_TAG_lexical_block ] [/local/mnt/workspace/build/tip-Release/t2.c]
50+
!11 = 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]
51+
!12 = metadata !{metadata !13}
52+
!13 = metadata !{metadata !"0x34\00A\00A\00\002\000\001", null, metadata !5, metadata !14, i32** @A, null} ; [ DW_TAG_variable ] [A] [line 2] [def]
53+
!14 = metadata !{metadata !"0xf\00\000\0064\0064\000\000", null, null, metadata !11} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from int]
54+
!15 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}
55+
!16 = metadata !{i32 2, metadata !"Debug Info Version", i32 2}
56+
!17 = metadata !{metadata !"clang version 3.6.0 "}
57+
!18 = metadata !{i32 0}
58+
!19 = metadata !{metadata !"0x102"} ; [ DW_TAG_expression ]
59+
!20 = metadata !{i32 4, i32 12, metadata !10, null}
60+
!21 = metadata !{i32 5, i32 5, metadata !22, null}
61+
!22 = metadata !{metadata !"0xb\004\003\001", metadata !1, metadata !10} ; [ DW_TAG_lexical_block ] [/local/mnt/workspace/build/tip-Release/t2.c]
62+
!23 = metadata !{metadata !24, metadata !24, i64 0}
63+
!24 = metadata !{metadata !"any pointer", metadata !25, i64 0}
64+
!25 = metadata !{metadata !"omnipotent char", metadata !26, i64 0}
65+
!26 = metadata !{metadata !"Simple C/C++ TBAA"}
66+
!27 = metadata !{i32 4, i32 3, metadata !28, null}
67+
!28 = metadata !{metadata !"0xb\002", metadata !1, metadata !29} ; [ DW_TAG_lexical_block ] [/local/mnt/workspace/build/tip-Release/t2.c]
68+
!29 = metadata !{metadata !"0xb\001", metadata !1, metadata !22} ; [ DW_TAG_lexical_block ] [/local/mnt/workspace/build/tip-Release/t2.c]
69+
!30 = metadata !{metadata !31, metadata !31, i64 0}
70+
!31 = metadata !{metadata !"int", metadata !25, i64 0}
71+
!32 = metadata !{i32 6, i32 1, metadata !4, null}

0 commit comments

Comments
 (0)
Please sign in to comment.