Skip to content

Commit 106dd19

Browse files
al45tairal45tair
committed
[Backtracing] Fix test failures.
I'd inserted an extra line, which upset the line numbers in the backtracing tests. Also tweak the Python build script tests slightly so they work. rdar://106234311
1 parent 1258d45 commit 106dd19

File tree

6 files changed

+254
-251
lines changed

6 files changed

+254
-251
lines changed

‎test/Backtracing/Crash.swift‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ struct Crash {
5050

5151
// CHECK: Thread 0 crashed:
5252

53-
// CHECK: 0 0x{{[0-9a-f]+}} level5() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:38:15
54-
// CHECK-NEXT: 1 [ra] 0x{{[0-9a-f]+}} level4() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:32:3
55-
// CHECK-NEXT: 2 [ra] 0x{{[0-9a-f]+}} level3() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:28:3
56-
// CHECK-NEXT: 3 [ra] 0x{{[0-9a-f]+}} level2() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:24:3
57-
// CHECK-NEXT: 4 [ra] 0x{{[0-9a-f]+}} level1() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:20:3
58-
// CHECK-NEXT: 5 [ra] 0x{{[0-9a-f]+}} static Crash.main() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:44:5
59-
// CHECK-NEXT: 6 [ra] [system] 0x{{[0-9a-f]+}} static Crash.$main() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:41:1
53+
// CHECK: 0 0x{{[0-9a-f]+}} level5() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:39:15
54+
// CHECK-NEXT: 1 [ra] 0x{{[0-9a-f]+}} level4() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:33:3
55+
// CHECK-NEXT: 2 [ra] 0x{{[0-9a-f]+}} level3() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:29:3
56+
// CHECK-NEXT: 3 [ra] 0x{{[0-9a-f]+}} level2() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:25:3
57+
// CHECK-NEXT: 4 [ra] 0x{{[0-9a-f]+}} level1() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:21:3
58+
// CHECK-NEXT: 5 [ra] 0x{{[0-9a-f]+}} static Crash.main() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:45:5
59+
// CHECK-NEXT: 6 [ra] [system] 0x{{[0-9a-f]+}} static Crash.$main() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:42:1
6060
// CHECK-NEXT: 7 [ra] [system] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in Crash at {{.*}}/Crash.swift
6161

6262
// CHECK: Registers:
@@ -69,59 +69,59 @@ struct Crash {
6969

7070
// FRIENDLY: Thread 0 crashed:
7171

72-
// FRIENDLY: 0 level5() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:38:15
72+
// FRIENDLY: 0 level5() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:39:15
7373

74-
// FRIENDLY: 36| print("About to crash")
75-
// FRIENDLY-NEXT: 37| let ptr = UnsafeMutablePointer<Int>(bitPattern: 4)!
76-
// FRIENDLY-NEXT: 38| ptr.pointee = 42
74+
// FRIENDLY: 37| print("About to crash")
75+
// FRIENDLY-NEXT: 38| let ptr = UnsafeMutablePointer<Int>(bitPattern: 4)!
76+
// FRIENDLY-NEXT: 39| ptr.pointee = 42
7777
// FRIENDLY-NEXT: | ^
78-
// FRIENDLY-NEXT: 39| }
79-
// FRIENDLY-NEXT: 40|
78+
// FRIENDLY-NEXT: 40| }
79+
// FRIENDLY-NEXT: 41|
8080

81-
// FRIENDLY: 1 level4() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:32:3
81+
// FRIENDLY: 1 level4() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:33:3
8282

83-
// FRIENDLY: 30|
84-
// FRIENDLY-NEXT: 31| func level4() {
85-
// FRIENDLY-NEXT: 32| level5()
83+
// FRIENDLY: 31|
84+
// FRIENDLY-NEXT: 32| func level4() {
85+
// FRIENDLY-NEXT: 33| level5()
8686
// FRIENDLY-NEXT: | ^
87-
// FRIENDLY-NEXT: 33| }
88-
// FRIENDLY-NEXT: 34|
87+
// FRIENDLY-NEXT: 34| }
88+
// FRIENDLY-NEXT: 35|
8989

90-
// FRIENDLY: 2 level3() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:28:3
90+
// FRIENDLY: 2 level3() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:29:3
9191

92-
// FRIENDLY: 26|
93-
// FRIENDLY-NEXT: 27| func level3() {
94-
// FRIENDLY-NEXT: 28| level4()
92+
// FRIENDLY: 27|
93+
// FRIENDLY-NEXT: 28| func level3() {
94+
// FRIENDLY-NEXT: 29| level4()
9595
// FRIENDLY-NEXT: | ^
96-
// FRIENDLY-NEXT: 29| }
97-
// FRIENDLY-NEXT: 30|
96+
// FRIENDLY-NEXT: 30| }
97+
// FRIENDLY-NEXT: 31|
9898

99-
// FRIENDLY: 3 level2() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:24:3
99+
// FRIENDLY: 3 level2() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:25:3
100100

101-
// FRIENDLY: 22|
102-
// FRIENDLY-NEXT: 23| func level2() {
103-
// FRIENDLY-NEXT: 24| level3()
101+
// FRIENDLY: 23|
102+
// FRIENDLY-NEXT: 24| func level2() {
103+
// FRIENDLY-NEXT: 25| level3()
104104
// FRIENDLY-NEXT: | ^
105-
// FRIENDLY-NEXT: 25| }
106-
// FRIENDLY-NEXT: 26|
105+
// FRIENDLY-NEXT: 26| }
106+
// FRIENDLY-NEXT: 27|
107107

108-
// FRIENDLY: 4 level1() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:20:3
108+
// FRIENDLY: 4 level1() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:21:3
109109

110-
// FRIENDLY: 18|
111-
// FRIENDLY-NEXT: 19| func level1() {
112-
// FRIENDLY-NEXT: 20| level2()
110+
// FRIENDLY: 19|
111+
// FRIENDLY-NEXT: 20| func level1() {
112+
// FRIENDLY-NEXT: 21| level2()
113113
// FRIENDLY-NEXT: | ^
114-
// FRIENDLY-NEXT: 21| }
115-
// FRIENDLY-NEXT: 22|
114+
// FRIENDLY-NEXT: 22| }
115+
// FRIENDLY-NEXT: 23|
116116

117-
// FRIENDLY: 5 static Crash.main() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:44:5
117+
// FRIENDLY: 5 static Crash.main() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:45:5
118118

119-
// FRIENDLY: 42| struct Crash {
120-
// FRIENDLY-NEXT: 43| static func main() {
121-
// FRIENDLY-NEXT: 44| level1()
119+
// FRIENDLY: 43| struct Crash {
120+
// FRIENDLY-NEXT: 44| static func main() {
121+
// FRIENDLY-NEXT: 45| level1()
122122
// FRIENDLY-NEXT: | ^
123-
// FRIENDLY-NEXT: 45| }
124-
// FRIENDLY-NEXT: 46| }
123+
// FRIENDLY-NEXT: 46| }
124+
// FRIENDLY-NEXT: 47| }
125125

126126
// NODEBUG: *** Program crashed: Bad pointer dereference at 0x{{0*}}4 ***
127127

@@ -146,13 +146,13 @@ struct Crash {
146146

147147
// OPTIMIZED: Thread 0 crashed:
148148

149-
// OPTIMIZED: 0 [inlined] 0x{{[0-9a-f]+}} level5() in CrashOpt at {{.*}}/Crash.swift:38:15
150-
// OPTIMIZED-NEXT: 1 [inlined] 0x{{[0-9a-f]+}} level4() in CrashOpt at {{.*}}/Crash.swift:32:3
151-
// OPTIMIZED-NEXT: 2 [inlined] 0x{{[0-9a-f]+}} level3() in CrashOpt at {{.*}}/Crash.swift:28:3
152-
// OPTIMIZED-NEXT: 3 [inlined] 0x{{[0-9a-f]+}} level2() in CrashOpt at {{.*}}/Crash.swift:24:3
153-
// OPTIMIZED-NEXT: 4 [inlined] 0x{{[0-9a-f]+}} level1() in CrashOpt at {{.*}}/Crash.swift:20:3
154-
// OPTIMIZED-NEXT: 5 [inlined] 0x{{[0-9a-f]+}} static Crash.main() in CrashOpt at {{.*}}/Crash.swift:44:5
155-
// OPTIMIZED-NEXT: 6 [inlined] [system] 0x{{[0-9a-f]+}} static Crash.$main() in CrashOpt at {{.*}}/Crash.swift:41:1
149+
// OPTIMIZED: 0 [inlined] 0x{{[0-9a-f]+}} level5() in CrashOpt at {{.*}}/Crash.swift:39:15
150+
// OPTIMIZED-NEXT: 1 [inlined] 0x{{[0-9a-f]+}} level4() in CrashOpt at {{.*}}/Crash.swift:33:3
151+
// OPTIMIZED-NEXT: 2 [inlined] 0x{{[0-9a-f]+}} level3() in CrashOpt at {{.*}}/Crash.swift:29:3
152+
// OPTIMIZED-NEXT: 3 [inlined] 0x{{[0-9a-f]+}} level2() in CrashOpt at {{.*}}/Crash.swift:25:3
153+
// OPTIMIZED-NEXT: 4 [inlined] 0x{{[0-9a-f]+}} level1() in CrashOpt at {{.*}}/Crash.swift:21:3
154+
// OPTIMIZED-NEXT: 5 [inlined] 0x{{[0-9a-f]+}} static Crash.main() in CrashOpt at {{.*}}/Crash.swift:45:5
155+
// OPTIMIZED-NEXT: 6 [inlined] [system] 0x{{[0-9a-f]+}} static Crash.$main() in CrashOpt at {{.*}}/Crash.swift:42:1
156156
// OPTIMIZED-NEXT: 7 [system] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in CrashOpt at {{.*}}/Crash.swift
157157

158158
// OPTIMIZED: Registers:

‎test/Backtracing/CrashWithThunk.swift‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ struct CrashWithThunk {
3131

3232
// CHECK: Thread 0 crashed:
3333

34-
// CHECK: 0 0x{{[0-9a-f]+}} crash() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:17:15
34+
// CHECK: 0 0x{{[0-9a-f]+}} crash() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:18:15
3535
// CHECK-NEXT: 1 [ra] [thunk] [system] 0x{{[0-9a-f]+}} thunk for @escaping @callee_guaranteed () -> () + {{[0-9]+}} in CrashWithThunk at {{.*}}/Backtracing/<compiler-generated>
36-
// CHECK-NEXT: 2 [ra] 0x{{[0-9a-f]+}} static CrashWithThunk.main() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:25:9
37-
// CHECK-NEXT: 3 [ra] [system] 0x{{[0-9a-f]+}} static CrashWithThunk.$main() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:20:1
36+
// CHECK-NEXT: 2 [ra] 0x{{[0-9a-f]+}} static CrashWithThunk.main() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:26:9
37+
// CHECK-NEXT: 3 [ra] [system] 0x{{[0-9a-f]+}} static CrashWithThunk.$main() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:21:1
3838
// CHECK-NEXT: 4 [ra] [system] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift
3939

4040
// CHECK: Registers:
@@ -47,20 +47,20 @@ struct CrashWithThunk {
4747

4848
// FRIENDLY: Thread 0 crashed:
4949

50-
// FRIENDLY: 0 crash() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:17:15
50+
// FRIENDLY: 0 crash() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:18:15
5151

52-
// FRIENDLY: 15| print("I'm going to crash here")
53-
// FRIENDLY-NEXT: 16| let ptr = UnsafeMutablePointer<Int>(bitPattern: 4)!
54-
// FRIENDLY-NEXT: 17| ptr.pointee = 42
52+
// FRIENDLY: 16| print("I'm going to crash here")
53+
// FRIENDLY-NEXT: 17| let ptr = UnsafeMutablePointer<Int>(bitPattern: 4)!
54+
// FRIENDLY-NEXT: 18| ptr.pointee = 42
5555
// FRIENDLY-NEXT: | ^
56-
// FRIENDLY-NEXT: 18| }
57-
// FRIENDLY-NEXT: 19|
56+
// FRIENDLY-NEXT: 19| }
57+
// FRIENDLY-NEXT: 20|
5858

59-
// FRIENDLY: 1 static CrashWithThunk.main() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:25:9
59+
// FRIENDLY: 1 static CrashWithThunk.main() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:26:9
6060

61-
// FRIENDLY: 23| let foo = Foo(value: crash)
62-
// FRIENDLY-NEXT: 24|
63-
// FRIENDLY-NEXT: 25| foo.value()
61+
// FRIENDLY: 24| let foo = Foo(value: crash)
62+
// FRIENDLY-NEXT: 25|
63+
// FRIENDLY-NEXT: 26| foo.value()
6464
// FRIENDLY-NEXT: | ^
65-
// FRIENDLY-NEXT: 26| }
66-
// FRIENDLY-NEXT: 27| }
65+
// FRIENDLY-NEXT: 27| }
66+
// FRIENDLY-NEXT: 28| }

‎test/Backtracing/Overflow.swift‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ struct Overflow {
4343
// CHECK: Thread 0 crashed:
4444

4545
// CHECK: 0 [inlined] [system] 0x{{[0-9a-f]+}} Swift runtime failure: arithmetic overflow in Overflow at {{.*}}/<compiler-generated>
46-
// CHECK-NEXT: 1 0x{{[0-9a-f]+}} level5() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:30:5
47-
// CHECK-NEXT: 2 [ra] 0x{{[0-9a-f]+}} level4() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:24:3
48-
// CHECK-NEXT: 3 [ra] 0x{{[0-9a-f]+}} level3() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:20:3
49-
// CHECK-NEXT: 4 [ra] 0x{{[0-9a-f]+}} level2() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:16:3
50-
// CHECK-NEXT: 5 [ra] 0x{{[0-9a-f]+}} level1() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:12:3
51-
// CHECK-NEXT: 6 [ra] 0x{{[0-9a-f]+}} static Overflow.main() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:36:5
52-
// CHECK-NEXT: 7 [ra] [system] 0x{{[0-9a-f]+}} static Overflow.$main() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:33:1
46+
// CHECK-NEXT: 1 0x{{[0-9a-f]+}} level5() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:31:5
47+
// CHECK-NEXT: 2 [ra] 0x{{[0-9a-f]+}} level4() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:25:3
48+
// CHECK-NEXT: 3 [ra] 0x{{[0-9a-f]+}} level3() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:21:3
49+
// CHECK-NEXT: 4 [ra] 0x{{[0-9a-f]+}} level2() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:17:3
50+
// CHECK-NEXT: 5 [ra] 0x{{[0-9a-f]+}} level1() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:13:3
51+
// CHECK-NEXT: 6 [ra] 0x{{[0-9a-f]+}} static Overflow.main() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:37:5
52+
// CHECK-NEXT: 7 [ra] [system] 0x{{[0-9a-f]+}} static Overflow.$main() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:34:1
5353
// CHECK-NEXT: 8 [ra] [system] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift
5454

5555
// CHECK: Registers:
@@ -62,49 +62,49 @@ struct Overflow {
6262

6363
// FRIENDLY: Thread 0 crashed:
6464

65-
// FRIENDLY: 0 level5() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:30:5
65+
// FRIENDLY: 0 level5() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:31:5
6666

67-
// FRIENDLY: 28| print("About to overflow")
68-
// FRIENDLY-NEXT: 29|
69-
// FRIENDLY-NEXT: 30| x -= 1
67+
// FRIENDLY: 29| print("About to overflow")
68+
// FRIENDLY-NEXT: 30|
69+
// FRIENDLY-NEXT: 31| x -= 1
7070
// FRIENDLY-NEXT: | ^
71-
// FRIENDLY-NEXT: 31| }
71+
// FRIENDLY-NEXT: 32| }
7272

73-
// FRIENDLY: 1 level4() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:24:3
73+
// FRIENDLY: 1 level4() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:25:3
7474

75-
// FRIENDLY: 22|
76-
// FRIENDLY-NEXT: 23| func level4() {
77-
// FRIENDLY-NEXT: 24| level5()
75+
// FRIENDLY: 23|
76+
// FRIENDLY-NEXT: 24| func level4() {
77+
// FRIENDLY-NEXT: 25| level5()
7878
// FRIENDLY-NEXT: | ^
79-
// FRIENDLY-NEXT: 25| }
80-
// FRIENDLY-NEXT: 26|
79+
// FRIENDLY-NEXT: 26| }
80+
// FRIENDLY-NEXT: 27|
8181

82-
// FRIENDLY: 2 level3() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:20:3
82+
// FRIENDLY: 2 level3() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:21:3
8383

84-
// FRIENDLY: 18|
85-
// FRIENDLY-NEXT: 19| func level3() {
86-
// FRIENDLY-NEXT: 20| level4()
84+
// FRIENDLY: 19|
85+
// FRIENDLY-NEXT: 20| func level3() {
86+
// FRIENDLY-NEXT: 21| level4()
8787
// FRIENDLY-NEXT: | ^
88-
// FRIENDLY-NEXT: 21| }
89-
// FRIENDLY-NEXT: 22|
88+
// FRIENDLY-NEXT: 22| }
89+
// FRIENDLY-NEXT: 23|
9090

91-
// FRIENDLY: 3 level2() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:16:3
91+
// FRIENDLY: 3 level2() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:17:3
9292

93-
// FRIENDLY: 14|
94-
// FRIENDLY-NEXT: 15| func level2() {
95-
// FRIENDLY-NEXT: 16| level3()
93+
// FRIENDLY: 15|
94+
// FRIENDLY-NEXT: 16| func level2() {
95+
// FRIENDLY-NEXT: 17| level3()
9696
// FRIENDLY-NEXT: | ^
97-
// FRIENDLY-NEXT: 17| }
98-
// FRIENDLY-NEXT: 18|
97+
// FRIENDLY-NEXT: 18| }
98+
// FRIENDLY-NEXT: 19|
9999

100-
// FRIENDLY: 4 level1() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:12:3
100+
// FRIENDLY: 4 level1() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:13:3
101101

102-
// FRIENDLY: 10|
103-
// FRIENDLY-NEXT: 11| func level1() {
104-
// FRIENDLY-NEXT: 12| level2()
102+
// FRIENDLY: 11|
103+
// FRIENDLY-NEXT: 12| func level1() {
104+
// FRIENDLY-NEXT: 13| level2()
105105
// FRIENDLY-NEXT: | ^
106-
// FRIENDLY-NEXT: 13| }
107-
// FRIENDLY-NEXT: 14|
106+
// FRIENDLY-NEXT: 14| }
107+
// FRIENDLY-NEXT: 15|
108108

109109
// FRIENDLY: 5 static Overflow.main() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift
110110

0 commit comments

Comments
 (0)