File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 9cfac52c5e6a2e00d104bdc2a231dfa79dfcd54b
2
+ refs/heads/master: 76d77c486b31cf589826bf5daf3e9e3bbb9c5ad4
3
3
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
4
4
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
5
5
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
Original file line number Diff line number Diff line change @@ -8,7 +8,10 @@ func f() {
8
8
markUsed ( " Test " )
9
9
#sourceLocation(file: "abc.swift", line: 142)
10
10
markUsed ( " abc again " )
11
- #sourceLocation(file: "/absolute/path/def.swift", line: 142)
11
+ // NOTE: we use `//absolute/path` here as this is an absolute path on the
12
+ // alternate root. However, it is also a path which is a UNC path on Windows.
13
+ // This allows the path to be absolute across both environments.
14
+ #sourceLocation(file: "//absolute/path/def.swift", line: 142)
12
15
markUsed ( " jump directly to def " )
13
16
}
14
17
@@ -19,7 +22,7 @@ func f() {
19
22
// CHECK: .loc [[ABC]] 42
20
23
// CHECK: .loc [[MAIN]] 8
21
24
// CHECK: .loc [[ABC]] 142
22
- // CHECK: .file [[DEF:.*]] "/absolute/path/ def.swift"
25
+ // CHECK: .file [[DEF:.*]] "// absolute/path{{/|\\\\}} def.swift"
23
26
// CHECK: .loc [[DEF]] 142
24
27
// CHECK: .asciz "{{.*}}test/DebugInfo"
25
28
@@ -32,6 +35,6 @@ func f() {
32
35
// VFS: .loc [[ABC]] 42
33
36
// VFS: .loc [[MAIN]] 8
34
37
// VFS: .loc [[ABC]] 142
35
- // VFS: .file [[DEF:.*]] "/absolute/path/ def.swift"
38
+ // VFS: .file [[DEF:.*]] "// absolute/path{{/|\\\\}} def.swift"
36
39
// VFS: .loc [[DEF]] 142
37
40
// VFS: .asciz "{{.*}}test/DebugInfo"
You can’t perform that action at this time.
0 commit comments