Skip to content

Commit b0b4503

Browse files
committed
Revert "Work around macOS build failures affecting test targets (swiftlang#1139)"
This reverts commit 603a568.
1 parent 77de51d commit b0b4503

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

Package.swift

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ let package = Package(
129129
"_Testing_Foundation",
130130
"MemorySafeTestingTests",
131131
],
132-
swiftSettings: .packageSettings + .disableMandatoryOptimizationsSettings
132+
swiftSettings: .packageSettings
133133
),
134134

135135
// Use a plain `.target` instead of a `.testTarget` to avoid the unnecessary
@@ -234,7 +234,7 @@ package.targets.append(contentsOf: [
234234
"Testing",
235235
"TestingMacros",
236236
],
237-
swiftSettings: .packageSettings + .disableMandatoryOptimizationsSettings
237+
swiftSettings: .packageSettings
238238
)
239239
])
240240
#endif
@@ -305,10 +305,7 @@ extension Array where Element == PackageDescription.SwiftSetting {
305305
// This setting is enabled in the package, but not in the toolchain build
306306
// (via CMake). Enabling it is dependent on acceptance of the @section
307307
// proposal via Swift Evolution.
308-
//
309-
// FIXME: Re-enable this once a CI blocker is resolved:
310-
// https://github.com/swiftlang/swift-testing/issues/1138.
311-
// .enableExperimentalFeature("SymbolLinkageMarkers"),
308+
.enableExperimentalFeature("SymbolLinkageMarkers"),
312309

313310
// This setting is no longer needed when building with a 6.2 or later
314311
// toolchain now that SE-0458 has been accepted and implemented, but it is
@@ -397,20 +394,6 @@ extension Array where Element == PackageDescription.SwiftSetting {
397394
[]
398395
#endif
399396
}
400-
401-
/// Settings which disable Swift's mandatory optimizations pass.
402-
///
403-
/// This is intended only to work around a build failure caused by a Swift
404-
/// compiler regression which is expected to be resolved in
405-
/// [swiftlang/swift#82034](https://github.com/swiftlang/swift/pull/82034).
406-
///
407-
/// @Comment {
408-
/// - Bug: This should be removed once the CI issue is resolved.
409-
/// [swiftlang/swift-testin#1138](https://github.com/swiftlang/swift-testing/issues/1138).
410-
/// }
411-
static var disableMandatoryOptimizationsSettings: Self {
412-
[.unsafeFlags(["-Xllvm", "-sil-disable-pass=mandatory-performance-optimizations"])]
413-
}
414397
}
415398

416399
extension Array where Element == PackageDescription.CXXSetting {

0 commit comments

Comments
 (0)