Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit a7f43a9984ff · 2019-05-20T18:09:12.000-07:00
diff --git a/test/Parse/source_locs.swift b/test/Parse/source_locs.swift
@@ -5,4 +5,4 @@ func string_interpolation() {
 }
 
 // RUN: %target-swift-frontend -dump-ast %s | %FileCheck %s
-// CHECK: (interpolated_string_literal_expr {{.*}} trailing_quote_loc=SOURCE_DIR/test/Parse/source_locs.swift:4:12 {{.*}}
+// CHECK: (interpolated_string_literal_expr {{.*}} trailing_quote_loc=SOURCE_DIR{{/|\\}}test{{/|\\}}Parse{{/|\\}}source_locs.swift:4:12 {{.*}}

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@ func string_interpolation() {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`// RUN: %target-swift-frontend -dump-ast %s \| %FileCheck %s`
`8`		`-// CHECK: (interpolated_string_literal_expr {{.}} trailing_quote_loc=SOURCE_DIR/test/Parse/source_locs.swift:4:12 {{.}}`
	`8`	`+// CHECK: (interpolated_string_literal_expr {{.}} trailing_quote_loc=SOURCE_DIR{{/\|\\}}test{{/\|\\}}Parse{{/\|\\}}source_locs.swift:4:12 {{.}}`