Skip to content

Commit 7e83686

Browse files
committed
Merge remote-tracking branch 'origin/master' into master-next
2 parents b89c9fd + 451c7ce commit 7e83686

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docs/ABI/Mangling.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Mangling
99
--------
1010
::
1111

12-
mangled-name ::= '_S' global
12+
mangled-name ::= '$S' global
1313

1414
All Swift-mangled names begin with this prefix.
1515

test/stdlib/Metal.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-build-swift %s -o %t/a.out4 -swift-version 4 && %target-run %t/a.out4
2+
// RUN: %target-build-swift %s -o %t/a.out4 -swift-version 4 && %target-codesign %t/a.out4 && %target-run %t/a.out4
33
// REQUIRES: objc_interop
44
// UNSUPPORTED: OS=watchos
55

0 commit comments

Comments
 (0)