Skip to content

Commit e49fd88

Browse files
kavonkavon
committed
nfc: use @line rather than hardcoded line numbers
The @line directive in FileCheck supports arithmetic, so this is an NFC to make the test less fragile.
1 parent d8b28cf commit e49fd88

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎test/IRGen/prespecialized-metadata/class-inmodule-1argument-run.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,29 +44,29 @@ func consume<T>(clazzType: MyGenericClazz<T>.Type) {
4444

4545

4646
public func doit() {
47-
// CHECK: [[FLOAT_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<Float> @ 48
47+
// CHECK: [[FLOAT_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<Float> @ [[@LINE+1]]
4848
consume(MyGenericClazz<Float>())
49-
// CHECK: [[FLOAT_METADATA_ADDRESS]] MyGenericClazz<Float> @ 50
49+
// CHECK: [[FLOAT_METADATA_ADDRESS]] MyGenericClazz<Float> @ [[@LINE+1]]
5050
consume(clazz: MyGenericClazz<Float>())
5151

52-
// CHECK: [[DOUBLE_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<Double> @ 53
52+
// CHECK: [[DOUBLE_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<Double> @ [[@LINE+1]]
5353
consume(MyGenericClazz<Double>())
54-
// CHECK: [[DOUBLE_METADATA_ADDRESS]] MyGenericClazz<Double> @ 55
54+
// CHECK: [[DOUBLE_METADATA_ADDRESS]] MyGenericClazz<Double> @ [[@LINE+1]]
5555
consume(clazz: MyGenericClazz<Double>())
5656

57-
// CHECK: [[INT_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<Int> @ 58
57+
// CHECK: [[INT_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<Int> @ [[@LINE+1]]
5858
consume(MyGenericClazz<Int>())
59-
// CHECK: [[INT_METADATA_ADDRESS]] MyGenericClazz<Int> @ 60
59+
// CHECK: [[INT_METADATA_ADDRESS]] MyGenericClazz<Int> @ [[@LINE+1]]
6060
consume(clazz: MyGenericClazz<Int>())
6161

62-
// CHECK: [[STRING_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<String> @ 63
62+
// CHECK: [[STRING_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<String> @ [[@LINE+1]]
6363
consume(MyGenericClazz<String>())
64-
// CHECK: [[STRING_METADATA_ADDRESS]] MyGenericClazz<String> @ 65
64+
// CHECK: [[STRING_METADATA_ADDRESS]] MyGenericClazz<String> @ [[@LINE+1]]
6565
consume(clazz: MyGenericClazz<String>())
6666

67-
// CHECK: [[NESTED_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<MyGenericClazz<String>> @ 68
67+
// CHECK: [[NESTED_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<MyGenericClazz<String>> @ [[@LINE+1]]
6868
consume(MyGenericClazz<MyGenericClazz<String>>())
69-
// CHECK: [[NESTED_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<MyGenericClazz<String>> @ 70
69+
// CHECK: [[NESTED_METADATA_ADDRESS:[0-9a-f]+]] MyGenericClazz<MyGenericClazz<String>> @ [[@LINE+1]]
7070
consume(clazz: MyGenericClazz<MyGenericClazz<String>>())
7171

7272
// CHECK: [[FLOAT_METADATA_METATYPE_ADDRESS:[0-9a-f]+]] MyGenericClazz<Float>

‎test/IRGen/prespecialized-metadata/class-inmodule-2argument-1super-2argument-run.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,20 @@ func consume<Input, Output>(derived: MyWeakMutableInstanceMethodBox<Input, Outp
6161
}
6262

6363
func doit() {
64-
// CHECK: [[SUPERCLASS_METADATA_INT_BOOL_ADDRESS:[0-9a-f]+]] WeakMutableInstanceMethodBox<Int, Bool> @ 65
64+
// CHECK: [[SUPERCLASS_METADATA_INT_BOOL_ADDRESS:[0-9a-f]+]] WeakMutableInstanceMethodBox<Int, Bool> @ [[@LINE+1]]
6565
consume(WeakMutableInstanceMethodBox<Int, Bool>())
66-
// CHECK: [[SUPERCLASS_METADATA_INT_BOOL_ADDRESS]] WeakMutableInstanceMethodBox<Int, Bool> @ 67
66+
// CHECK: [[SUPERCLASS_METADATA_INT_BOOL_ADDRESS]] WeakMutableInstanceMethodBox<Int, Bool> @ [[@LINE+1]]
6767
consume(base: WeakMutableInstanceMethodBox<Int, Bool>())
68-
// CHECK: [[SUPERCLASS_METADATA_DOUBLE_FLOAT_ADDRESS:[0-9a-f]+]] WeakMutableInstanceMethodBox<Double, Float> @ 69
68+
// CHECK: [[SUPERCLASS_METADATA_DOUBLE_FLOAT_ADDRESS:[0-9a-f]+]] WeakMutableInstanceMethodBox<Double, Float> @ [[@LINE+1]]
6969
consume(WeakMutableInstanceMethodBox<Double, Float>())
70-
// CHECK: [[SUPERCLASS_METADATA_DOUBLE_FLOAT_ADDRESS]] WeakMutableInstanceMethodBox<Double, Float> @ 71
70+
// CHECK: [[SUPERCLASS_METADATA_DOUBLE_FLOAT_ADDRESS]] WeakMutableInstanceMethodBox<Double, Float> @ [[@LINE+1]]
7171
consume(base: WeakMutableInstanceMethodBox<Double, Float>())
7272

73-
// CHECK: [[SUBCLASS_METADATA_INT_BOOL_ADDRESS:[0-9a-f]+]] MyWeakMutableInstanceMethodBox<Int, Bool> @ 74
73+
// CHECK: [[SUBCLASS_METADATA_INT_BOOL_ADDRESS:[0-9a-f]+]] MyWeakMutableInstanceMethodBox<Int, Bool> @ [[@LINE+1]]
7474
consume(MyWeakMutableInstanceMethodBox<Int, Bool>())
75-
// CHECK: [[SUPERCLASS_METADATA_INT_BOOL_ADDRESS]] MyWeakMutableInstanceMethodBox<Int, Bool> @ 76
75+
// CHECK: [[SUPERCLASS_METADATA_INT_BOOL_ADDRESS]] MyWeakMutableInstanceMethodBox<Int, Bool> @ [[@LINE+1]]
7676
consume(base: MyWeakMutableInstanceMethodBox<Int, Bool>())
77-
// CHECK: [[SUBCLASS_METADATA_INT_BOOL_ADDRESS]] MyWeakMutableInstanceMethodBox<Int, Bool> @ 78
77+
// CHECK: [[SUBCLASS_METADATA_INT_BOOL_ADDRESS]] MyWeakMutableInstanceMethodBox<Int, Bool> @ [[@LINE+1]]
7878
consume(derived: MyWeakMutableInstanceMethodBox<Int, Bool>())
7979

8080
// CHECK: [[SUBCLASS_METADATA_DOUBLE_FLOAT_ADDRESS:[0-9a-f]+]] MyWeakMutableInstanceMethodBox<Double, Float>

‎test/IRGen/prespecialized-metadata/struct-inmodule-otherfile-1argument-run.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ func consume<First>(oneArgument: OneArgument<First>) {
1717
}
1818

1919
func doit() {
20-
// CHECK: [[METADATA_ADDRESS:[0-9a-f]+]] 3 @ 21
20+
// CHECK: [[METADATA_ADDRESS:[0-9a-f]+]] 3 @ [[@LINE+1]]
2121
consume(OneArgument(3))
22-
// CHECK: [[METADATA_ADDRESS]] 3 @ 23
22+
// CHECK: [[METADATA_ADDRESS]] 3 @ [[@LINE+1]]
2323
consume(oneArgument: OneArgument(3))
2424
}

‎test/IRGen/prespecialized-metadata/struct-outmodule-run.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,27 @@ func consumeType_OneArgumentAtFirstUsageDynamic_Dynamic(line: UInt = #line) {
5151

5252
@inline(never)
5353
func doit() {
54-
// CHECK: [[STATIC_METADATA_ADDRESS:[0-9a-f]+]] @ 55
54+
// CHECK: [[STATIC_METADATA_ADDRESS:[0-9a-f]+]] @ [[@LINE+1]]
5555
consumeType_OneArgumentAtFirstUsageStatic_Static()
56-
// CHECK: [[STATIC_METADATA_ADDRESS]] @ 57
56+
// CHECK: [[STATIC_METADATA_ADDRESS]] @ [[@LINE+1]]
5757
consumeType_OneArgumentAtFirstUsageStatic_Dynamic()
58-
// CHECK: [[STATIC_METADATA_ADDRESS]] @ 59
58+
// CHECK: [[STATIC_METADATA_ADDRESS]] @ [[@LINE+1]]
5959
consumeType_OneArgumentAtFirstUsageStatic_Dynamic()
60-
// CHECK: [[DYNAMIC_METADATA_ADDRESS:[0-9a-f]+]] @ 61
60+
// CHECK: [[DYNAMIC_METADATA_ADDRESS:[0-9a-f]+]] @ [[@LINE+1]]
6161
consumeType_OneArgumentAtFirstUsageDynamic_Dynamic()
62-
// CHECK: [[DYNAMIC_METADATA_ADDRESS:[0-9a-f]+]] @ 63
62+
// CHECK: [[DYNAMIC_METADATA_ADDRESS:[0-9a-f]+]] @ [[@LINE+1]]
6363
consumeType_OneArgumentAtFirstUsageDynamic_Dynamic()
64-
// CHECK: [[DYNAMIC_METADATA_ADDRESS]] @ 65
64+
// CHECK: [[DYNAMIC_METADATA_ADDRESS]] @ [[@LINE+1]]
6565
consumeType_OneArgumentAtFirstUsageDynamic_Static()
6666

6767
let staticMetadata = ptr(to: OneArgument<FirstUsageStatic>.self)
68-
// CHECK: [[STATIC_METADATA_ADDRESS]] @ 69
68+
// CHECK: [[STATIC_METADATA_ADDRESS]] @ [[@LINE+1]]
6969
print(staticMetadata, "@", #line)
7070
assert(isStaticallySpecializedGenericMetadata(staticMetadata))
7171
assert(!isCanonicalStaticallySpecializedGenericMetadata(staticMetadata))
7272

7373
let dynamicMetadata = ptr(to: OneArgument<FirstUsageDynamic>.self)
74-
// CHECK: [[DYNAMIC_METADATA_ADDRESS]] @ 75
74+
// CHECK: [[DYNAMIC_METADATA_ADDRESS]] @ [[@LINE+1]]
7575
print(dynamicMetadata, "@", #line)
7676
assert(!isStaticallySpecializedGenericMetadata(dynamicMetadata))
7777
assert(!isCanonicalStaticallySpecializedGenericMetadata(dynamicMetadata))

0 commit comments

Comments
 (0)