Skip to content

Commit c6114c6

Browse files
committed
---
yaml --- r: 347331 b: refs/heads/master c: 76d77c4 h: refs/heads/master i: 347329: 876d680 347327: 0299234
1 parent fad0171 commit c6114c6

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 9cfac52c5e6a2e00d104bdc2a231dfa79dfcd54b
2+
refs/heads/master: 76d77c486b31cf589826bf5daf3e9e3bbb9c5ad4
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/test/DebugInfo/line-directive.swift

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ func f() {
88
markUsed("Test")
99
#sourceLocation(file: "abc.swift", line: 142)
1010
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)
1215
markUsed("jump directly to def")
1316
}
1417

@@ -19,7 +22,7 @@ func f() {
1922
// CHECK: .loc [[ABC]] 42
2023
// CHECK: .loc [[MAIN]] 8
2124
// CHECK: .loc [[ABC]] 142
22-
// CHECK: .file [[DEF:.*]] "/absolute/path/def.swift"
25+
// CHECK: .file [[DEF:.*]] "//absolute/path{{/|\\\\}}def.swift"
2326
// CHECK: .loc [[DEF]] 142
2427
// CHECK: .asciz "{{.*}}test/DebugInfo"
2528

@@ -32,6 +35,6 @@ func f() {
3235
// VFS: .loc [[ABC]] 42
3336
// VFS: .loc [[MAIN]] 8
3437
// VFS: .loc [[ABC]] 142
35-
// VFS: .file [[DEF:.*]] "/absolute/path/def.swift"
38+
// VFS: .file [[DEF:.*]] "//absolute/path{{/|\\\\}}def.swift"
3639
// VFS: .loc [[DEF]] 142
3740
// VFS: .asciz "{{.*}}test/DebugInfo"

0 commit comments

Comments
 (0)