Skip to content

Commit 71e623d

Browse files
elvinw-intelelvinw-intel
authored
[llvm] Avoid out-of-order evaluation in DebugInfo (#125116)
This is an upstream proposal from intel/intel-graphics-compiler@e60884c We observed malfunctioning StripNonLineTableDebugInfo during debugging and it's caused by out-of-order evaluation, this is a C++ level semantic ambiguity issue, refer https://en.cppreference.com/w/cpp/language/eval_order Solution is simply separating one line into two.
1 parent 1188b1f commit 71e623d

File tree

2 files changed

+93
-1
lines changed

2 files changed

+93
-1
lines changed

‎llvm/lib/IR/DebugInfo.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,11 @@ class DebugTypeInfoRemoval {
798798

799799
return getReplacementMDNode(N);
800800
};
801-
Replacements[N] = doRemap(N);
801+
// Seperate recursive doRemap and operator [] into 2 lines to avoid
802+
// out-of-order evaluations since both of them can access the same memory
803+
// location in map Replacements.
804+
auto Value = doRemap(N);
805+
Replacements[N] = Value;
802806
}
803807

804808
/// Do the remapping traversal.

‎llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-pr125116.ll

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
; Test if StripNonLineTableDebugInfo crashes or produces invalid IR,
2+
; this test contains a slightly complex debug info structure,
3+
; which may trigger the bug mentioned in pr#125116
4+
;
5+
; RUN: opt < %s -p=strip-nonlinetable-debuginfo -S | FileCheck %s
6+
;
7+
; CHECK-NOT: DIBasicType
8+
; CHECK-NOT: DIDerivedType
9+
; CHECK-NOT: DICompositeType
10+
; CHECK-NOT: DILocation(line: 604, column: 1, scope: null)
11+
12+
define void @main() !dbg !34 {
13+
ret void, !dbg !68
14+
}
15+
16+
!llvm.dbg.cu = !{!0}
17+
!llvm.module.flags = !{!31, !32}
18+
!llvm.ident = !{!33}
19+
20+
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 3.7 (tags/RELEASE_370/final)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, globals: !2)
21+
!1 = !DIFile(filename: "no filename", directory: "")
22+
!2 = !{}
23+
!3 = !{!4, !22}
24+
!4 = !DIDerivedType(tag: DW_TAG_typedef, name: "float3x3", file: !1, line: 361, baseType: !5)
25+
!5 = !DICompositeType(tag: DW_TAG_class_type, name: "matrix<float, 3, 3>", file: !1, line: 246, size: 288, align: 32, elements: !6, templateParams: !17)
26+
!6 = !{!7, !9, !10, !11, !12, !13, !14, !15, !16}
27+
!7 = !DIDerivedType(tag: DW_TAG_member, name: "_11", scope: !5, file: !1, line: 246, baseType: !8, size: 32, align: 32, flags: DIFlagPublic)
28+
!8 = !DIBasicType(name: "float", size: 32, align: 32, encoding: DW_ATE_float)
29+
!9 = !DIDerivedType(tag: DW_TAG_member, name: "_12", scope: !5, file: !1, line: 246, baseType: !8, size: 32, align: 32, offset: 32, flags: DIFlagPublic)
30+
!10 = !DIDerivedType(tag: DW_TAG_member, name: "_13", scope: !5, file: !1, line: 246, baseType: !8, size: 32, align: 32, offset: 64, flags: DIFlagPublic)
31+
!11 = !DIDerivedType(tag: DW_TAG_member, name: "_21", scope: !5, file: !1, line: 246, baseType: !8, size: 32, align: 32, offset: 96, flags: DIFlagPublic)
32+
!12 = !DIDerivedType(tag: DW_TAG_member, name: "_22", scope: !5, file: !1, line: 246, baseType: !8, size: 32, align: 32, offset: 128, flags: DIFlagPublic)
33+
!13 = !DIDerivedType(tag: DW_TAG_member, name: "_23", scope: !5, file: !1, line: 246, baseType: !8, size: 32, align: 32, offset: 160, flags: DIFlagPublic)
34+
!14 = !DIDerivedType(tag: DW_TAG_member, name: "_31", scope: !5, file: !1, line: 246, baseType: !8, size: 32, align: 32, offset: 192, flags: DIFlagPublic)
35+
!15 = !DIDerivedType(tag: DW_TAG_member, name: "_32", scope: !5, file: !1, line: 246, baseType: !8, size: 32, align: 32, offset: 224, flags: DIFlagPublic)
36+
!16 = !DIDerivedType(tag: DW_TAG_member, name: "_33", scope: !5, file: !1, line: 246, baseType: !8, size: 32, align: 32, offset: 256, flags: DIFlagPublic)
37+
!17 = !{!18, !19, !21}
38+
!18 = !DITemplateTypeParameter(name: "element", type: !8)
39+
!19 = !DITemplateValueParameter(name: "row_count", type: !20, value: i32 3)
40+
!20 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)
41+
!21 = !DITemplateValueParameter(name: "col_count", type: !20, value: i32 3)
42+
!22 = !DIDerivedType(tag: DW_TAG_typedef, name: "float4", file: !1, baseType: !23)
43+
!23 = !DICompositeType(tag: DW_TAG_class_type, name: "vector<float, 4>", file: !1, size: 128, align: 32, elements: !24, templateParams: !29)
44+
!24 = !{!25, !26, !27, !28}
45+
!25 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !23, file: !1, baseType: !8, size: 32, align: 32, flags: DIFlagPublic)
46+
!26 = !DIDerivedType(tag: DW_TAG_member, name: "y", scope: !23, file: !1, baseType: !8, size: 32, align: 32, offset: 32, flags: DIFlagPublic)
47+
!27 = !DIDerivedType(tag: DW_TAG_member, name: "z", scope: !23, file: !1, baseType: !8, size: 32, align: 32, offset: 64, flags: DIFlagPublic)
48+
!28 = !DIDerivedType(tag: DW_TAG_member, name: "w", scope: !23, file: !1, baseType: !8, size: 32, align: 32, offset: 96, flags: DIFlagPublic)
49+
!29 = !{!18, !30}
50+
!30 = !DITemplateValueParameter(name: "element_count", type: !20, value: i32 4)
51+
!31 = !{i32 2, !"Dwarf Version", i32 4}
52+
!32 = !{i32 2, !"Debug Info Version", i32 3}
53+
!33 = !{!"clang version 3.7 (tags/RELEASE_370/final)"}
54+
!34 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 581, type: !35, scopeLine: 582, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0)
55+
!35 = !DISubroutineType(types: !36)
56+
!36 = !{null, !37, !58}
57+
!37 = !DICompositeType(tag: DW_TAG_structure_type, name: "VertexInput", file: !1, line: 254, size: 416, align: 32, elements: !38)
58+
!38 = !{!39, !40, !48, !57}
59+
!39 = !DIDerivedType(tag: DW_TAG_member, name: "Position", scope: !37, file: !1, line: 256, baseType: !22, size: 128, align: 32)
60+
!40 = !DIDerivedType(tag: DW_TAG_member, name: "TexCoord", scope: !37, file: !1, line: 257, baseType: !41, size: 64, align: 32, offset: 128)
61+
!41 = !DIDerivedType(tag: DW_TAG_typedef, name: "float2", file: !1, baseType: !42)
62+
!42 = !DICompositeType(tag: DW_TAG_class_type, name: "vector<float, 2>", file: !1, size: 64, align: 32, elements: !43, templateParams: !46)
63+
!43 = !{!44, !45}
64+
!44 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !42, file: !1, baseType: !8, size: 32, align: 32, flags: DIFlagPublic)
65+
!45 = !DIDerivedType(tag: DW_TAG_member, name: "y", scope: !42, file: !1, baseType: !8, size: 32, align: 32, offset: 32, flags: DIFlagPublic)
66+
!46 = !{!18, !47}
67+
!47 = !DITemplateValueParameter(name: "element_count", type: !20, value: i32 2)
68+
!48 = !DIDerivedType(tag: DW_TAG_member, name: "Normal", scope: !37, file: !1, line: 258, baseType: !49, size: 96, align: 32, offset: 192)
69+
!49 = !DIDerivedType(tag: DW_TAG_typedef, name: "float3", file: !1, baseType: !50)
70+
!50 = !DICompositeType(tag: DW_TAG_class_type, name: "vector<float, 3>", file: !1, size: 96, align: 32, elements: !51, templateParams: !55)
71+
!51 = !{!52, !53, !54}
72+
!52 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !50, file: !1, baseType: !8, size: 32, align: 32, flags: DIFlagPublic)
73+
!53 = !DIDerivedType(tag: DW_TAG_member, name: "y", scope: !50, file: !1, baseType: !8, size: 32, align: 32, offset: 32, flags: DIFlagPublic)
74+
!54 = !DIDerivedType(tag: DW_TAG_member, name: "z", scope: !50, file: !1, baseType: !8, size: 32, align: 32, offset: 64, flags: DIFlagPublic)
75+
!55 = !{!18, !56}
76+
!56 = !DITemplateValueParameter(name: "element_count", type: !20, value: i32 3)
77+
!57 = !DIDerivedType(tag: DW_TAG_member, name: "Tangent", scope: !37, file: !1, line: 259, baseType: !22, size: 128, align: 32, offset: 288)
78+
!58 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !59)
79+
!59 = !DICompositeType(tag: DW_TAG_structure_type, name: "VertexOutput", file: !1, line: 269, size: 672, align: 32, elements: !60)
80+
!60 = !{!61, !62, !63, !64, !65, !66, !67}
81+
!61 = !DIDerivedType(tag: DW_TAG_member, name: "Position", scope: !59, file: !1, line: 271, baseType: !22, size: 128, align: 32)
82+
!62 = !DIDerivedType(tag: DW_TAG_member, name: "TexCoord", scope: !59, file: !1, line: 272, baseType: !41, size: 64, align: 32, offset: 128)
83+
!63 = !DIDerivedType(tag: DW_TAG_member, name: "TangentInView", scope: !59, file: !1, line: 273, baseType: !49, size: 96, align: 32, offset: 192)
84+
!64 = !DIDerivedType(tag: DW_TAG_member, name: "BitangentInView", scope: !59, file: !1, line: 274, baseType: !49, size: 96, align: 32, offset: 288)
85+
!65 = !DIDerivedType(tag: DW_TAG_member, name: "NormalInView", scope: !59, file: !1, line: 275, baseType: !49, size: 96, align: 32, offset: 384)
86+
!66 = !DIDerivedType(tag: DW_TAG_member, name: "EyeDirectionInView", scope: !59, file: !1, line: 276, baseType: !49, size: 96, align: 32, offset: 480)
87+
!67 = !DIDerivedType(tag: DW_TAG_member, name: "PositionInView", scope: !59, file: !1, line: 277, baseType: !49, size: 96, align: 32, offset: 576)
88+
!68 = !DILocation(line: 604, column: 1, scope: !34)

0 commit comments

Comments
 (0)