Skip to content

Commit 7e00de1

Browse files
committed
Merge remote-tracking branch 'origin/main' into rebranch
2 parents c8d99d3 + 22f32e0 commit 7e00de1

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

test/LinkerSections/function_sections.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@
1111
// GOLD: .text.$s16FunctionSections5func1yyF
1212

1313
// LLD: .text.$s16FunctionSections5func1yyF
14-
// LLD-NOT: .text.$s16FunctionSections5func2yyF

test/Sanitizers/tsan/tsan.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var racey_x: Int;
5050

5151
// TSan %deflake as part of the test.
5252
for _ in 1...5 {
53-
#if os(macOS) || os(iOS)
53+
#if os(macOS) || os(iOS) || os(FreeBSD)
5454
var t : pthread_t?
5555
#else
5656
var t : pthread_t = 0
@@ -61,7 +61,7 @@ for _ in 1...5 {
6161

6262
return nil
6363
}, nil)
64-
#if os(macOS) || os(iOS)
64+
#if os(macOS) || os(iOS) || os(FreeBSD)
6565
threads.append(t!)
6666
#else
6767
threads.append(t)

test/stdlib/symbol-visibility-linux.test-sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,10 @@
261261
// RUN: -e _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE22__resize_and_overwriteIZNS_9to_stringEiEUlPcmE_EEvmT_ \
262262
// RUN: -e _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE22__resize_and_overwriteIZNS_9to_stringEjEUlPcmE_EEvmT_ \
263263
// RUN: -e _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE22__resize_and_overwriteIZNS_9to_stringEmEUlPcmE_EEvmT_ \
264+
// RUN: -e _ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_appendIJRKS5_EEEvDpOT_ \
265+
// RUN: -e _ZNSt6vectorISt10unique_ptrIKvSt8functionIFvPS1_EEESaIS6_EE17_M_realloc_appendIJS6_EEEvDpOT_ \
266+
// RUN: -e _ZNSt6vectorISt8optionalISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbEESaIS9_EE17_M_realloc_appendIJRKS9_EEEvDpOT_ \
267+
// RUN: -e _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE22__resize_and_overwriteIZNS_9to_stringElEUlPcmE_EEvmT_ \
264268
// RUN: > %t/swiftCore-all.txt
265269
// RUN: %llvm-nm --defined-only --extern-only --no-weak %platform-dylib-dir/%target-library-name(swiftCore) > %t/swiftCore-no-weak.txt
266270
// RUN: diff -u %t/swiftCore-all.txt %t/swiftCore-no-weak.txt
@@ -527,6 +531,10 @@
527531
// RUN: -e _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE22__resize_and_overwriteIZNS_9to_stringEiEUlPcmE_EEvmT_ \
528532
// RUN: -e _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE22__resize_and_overwriteIZNS_9to_stringEjEUlPcmE_EEvmT_ \
529533
// RUN: -e _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE22__resize_and_overwriteIZNS_9to_stringEmEUlPcmE_EEvmT_ \
534+
// RUN: -e _ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_appendIJRKS5_EEEvDpOT_ \
535+
// RUN: -e _ZNSt6vectorISt10unique_ptrIKvSt8functionIFvPS1_EEESaIS6_EE17_M_realloc_appendIJS6_EEEvDpOT_ \
536+
// RUN: -e _ZNSt6vectorISt8optionalISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbEESaIS9_EE17_M_realloc_appendIJRKS9_EEEvDpOT_ \
537+
// RUN: -e _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE22__resize_and_overwriteIZNS_9to_stringElEUlPcmE_EEvmT_ \
530538
// RUN: > %t/swiftRemoteMirror-all.txt
531539
// RUN: %llvm-nm --defined-only --extern-only --no-weak %platform-dylib-dir/%target-library-name(swiftRemoteMirror) > %t/swiftRemoteMirror-no-weak.txt
532540
// RUN: diff -u %t/swiftRemoteMirror-all.txt %t/swiftRemoteMirror-no-weak.txt

validation-test/Sanitizers/tsan-inout.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var gInThread2: () -> () = { }
2727
// Spawn two threads, run the two passed in closures simultaneously, and
2828
// join them.
2929
func testRace(name: String, thread inThread1: @escaping () -> (), thread inThread2: @escaping () -> ()) {
30-
#if canImport(Darwin)
30+
#if canImport(Darwin) || os(FreeBSD)
3131
var thread1: pthread_t?
3232
var thread2: pthread_t?
3333
#else

validation-test/stdlib/SIMDParameterPassing.swift.gyb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// REQUIRES: executable_test
2020
// REQUIRES: long_test
2121
// XFAIL: OS=linux-gnu, OS=linux-android
22+
// UNSUPPORTED: OS=freebsd
2223

2324
import StdlibUnittest
2425
import simd

0 commit comments

Comments
 (0)