Skip to content

Commit 00986f3

Browse files
author
David Ungar
committed
---
yaml --- r: 340606 b: refs/heads/rxwei-patch-1 c: 2d0a8f2 h: refs/heads/master
1 parent 3127938 commit 00986f3

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
10151015
refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
10161016
refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
10171017
refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
1018-
refs/heads/rxwei-patch-1: 6b6c983594b2f035fedec79f5e78809764f3af7c
1018+
refs/heads/rxwei-patch-1: 2d0a8f2c6af48be92d58e83fe2268f07a15647ec
10191019
refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
10201020
refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
10211021
refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

‎branches/rxwei-patch-1/test/NameBinding/scope_map.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,9 @@ class LazyProperties {
282282
// CHECK-EXPANDED-NEXT: |-TypeAliasDeclScope {{.*}}, [60:3 - 60:23] <no extended nominal?!>
283283
// CHECK-EXPANDED-NEXT: |-IfStmtScope {{.*}}, [62:3 - 66:3]
284284
// CHECK-EXPANDED-NEXT: |-ConditionalClauseScope, [62:6 - 64:3] index 0
285-
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [62:18 - 64:3] let b1
285+
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [62:18 - 64:3] let b1{{.*}}
286286
// CHECK-EXPANDED-NEXT: `-ConditionalClauseScope, [62:18 - 64:3] index 1
287-
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [62:29 - 64:3] let b2
287+
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [62:29 - 64:3] let b2{{.*}}
288288
// CHECK-EXPANDED-NEXT: `-BraceStmtScope {{.*}}, [62:29 - 64:3]
289289
// CHECK-EXPANDED-NEXT: `-PatternEntryDeclScope {{.*}}, [63:9 - 63:14] entry 0 'c1'
290290
// CHECK-EXPANDED-NEXT: |-PatternEntryInitializerScope {{.*}}, [63:14 - 63:14] entry 0 'c1'
@@ -295,23 +295,23 @@ class LazyProperties {
295295
// CHECK-EXPANDED-NEXT: `-PatternEntryUseScope {{.*}}, [65:14 - 65:14] entry 0 'c2'
296296
// CHECK-EXPANDED-NEXT: `-GuardStmtScope {{.*}}, [68:3 - 99:38]
297297
// CHECK-EXPANDED-NEXT: |-ConditionalClauseScope, [68:9 - 68:53] index 0
298-
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [68:21 - 68:53] let b1
298+
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [68:21 - 68:53] let b1{{.*}}
299299
// CHECK-EXPANDED-NEXT: `-ConditionalClauseScope, [68:21 - 68:53] index 1
300300
// CHECK-EXPANDED-NEXT: |-WholeClosureScope {{.*}}, [68:21 - 68:30]
301301
// CHECK-EXPANDED-NEXT: `-ClosureBodyScope {{.*}}, [68:21 - 68:30]
302302
// CHECK-EXPANDED-NEXT: `-BraceStmtScope {{.*}}, [68:21 - 68:30]
303303
// CHECK-EXPANDED-NEXT: `-ConditionalClauseScope, [68:37 - 68:53] index 2
304-
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [68:53 - 68:53] let b2
304+
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [68:53 - 68:53] let b2{{.*}}
305305
// CHECK-EXPANDED-NEXT: |-BraceStmtScope {{.*}}, [68:53 - 71:3]
306306
// CHECK-EXPANDED-NEXT: `-PatternEntryDeclScope {{.*}}, [69:9 - 69:13] entry 0 'c'
307307
// CHECK-EXPANDED-NEXT: |-PatternEntryInitializerScope {{.*}}, [69:13 - 69:13] entry 0 'c'
308308
// CHECK-EXPANDED-NEXT: `-PatternEntryUseScope {{.*}}, [69:13 - 69:13] entry 0 'c'
309309
// CHECK-EXPANDED-NEXT: `-GuardStmtUseScope, [71:3 - 99:38]
310310
// CHECK-EXPANDED-NEXT: |-WhileStmtScope {{.*}}, [73:3 - 75:3]
311311
// CHECK-EXPANDED-NEXT: `-ConditionalClauseScope, [73:9 - 75:3] index 0
312-
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [73:21 - 75:3] let b3
312+
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [73:21 - 75:3] let b3{{.*}}
313313
// CHECK-EXPANDED-NEXT: `-ConditionalClauseScope, [73:21 - 75:3] index 1
314-
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [73:32 - 75:3] let b4
314+
// CHECK-EXPANDED-NEXT: `-ConditionalClausePatternUseScope, [73:32 - 75:3] let b4{{.*}}
315315
// CHECK-EXPANDED-NEXT: `-BraceStmtScope {{.*}}, [73:32 - 75:3]
316316
// CHECK-EXPANDED-NEXT: `-PatternEntryDeclScope {{.*}}, [74:9 - 74:13] entry 0 'c'
317317
// CHECK-EXPANDED-NEXT: |-PatternEntryInitializerScope {{.*}}, [74:13 - 74:13] entry 0 'c'
@@ -512,13 +512,13 @@ class LazyProperties {
512512
// CHECK-SEARCHES-NEXT: {{.*}} Module name=scope_map
513513
// CHECK-SEARCHES-NEXT: {{.*}} FileUnit file="SOURCE_DIR/test/NameBinding/scope_map.swift"
514514
// CHECK-SEARCHES-NEXT: {{.*}} StructDecl name=PatternInitializers
515-
// CHECK-SEARCHES-NEXT: {{.*}} Initializer PatternBinding {{.*}}18 #1
515+
// CHECK-SEARCHES-NEXT: {{.*}} Initializer PatternBinding {{.*}} #1
516516
// CHECK-SEARCHES-NEXT: ***Scope at 193:26***
517517
// CHECK-SEARCHES-NEXT: PatternEntryInitializerScope {{.*}}, [193:24 - 193:29] entry 0 'prop'
518518
// CHECK-SEARCHES-NEXT: {{.*}} Module name=scope_map
519519
// CHECK-SEARCHES-NEXT: {{.*}} FileUnit file="SOURCE_DIR/test/NameBinding/scope_map.swift"
520520
// CHECK-SEARCHES-NEXT: {{.*}} ClassDecl name=LazyProperties
521-
// CHECK-SEARCHES-NEXT: {{.*}} Initializer PatternBinding {{.*}}80 #0
521+
// CHECK-SEARCHES-NEXT: {{.*}} Initializer PatternBinding {{.*}} #0
522522
// CHECK-SEARCHES-NEXT: Local bindings: self
523523

524524
// CHECK-SEARCHES-NOT: ***Complete scope map***

0 commit comments

Comments
 (0)