diff --git a/include/swift/Basic/LangOptions.h b/include/swift/Basic/LangOptions.h index d9d90eda3d4b7..0c8fa84984a64 100644 --- a/include/swift/Basic/LangOptions.h +++ b/include/swift/Basic/LangOptions.h @@ -528,7 +528,7 @@ namespace swift { /// Enable the new experimental protocol requirement signature minimization /// algorithm. RequirementMachineMode RequirementMachineProtocolSignatures = - RequirementMachineMode::Verify; + RequirementMachineMode::Enabled; /// Enable the new experimental generic signature minimization algorithm /// for abstract generic signatures. @@ -538,7 +538,7 @@ namespace swift { /// Enable the new experimental generic signature minimization algorithm /// for user-written generic signatures. RequirementMachineMode RequirementMachineInferredSignatures = - RequirementMachineMode::Verify; + RequirementMachineMode::Enabled; /// Enable preprocessing pass to eliminate conformance requirements /// on generic parameters which are made concrete. Usually you want this diff --git a/stdlib/cmake/modules/SwiftSource.cmake b/stdlib/cmake/modules/SwiftSource.cmake index 128ddde624ca7..903214b874cae 100644 --- a/stdlib/cmake/modules/SwiftSource.cmake +++ b/stdlib/cmake/modules/SwiftSource.cmake @@ -469,11 +469,6 @@ function(_compile_swift_files endif() endif() - # The standard library and overlays are built with the Requirement Machine enabled. - if(SWIFTFILE_IS_STDLIB) - list(APPEND swift_flags "-Xfrontend" "-requirement-machine-inferred-signatures=verify") - endif() - # The standard library and overlays are built resiliently when SWIFT_STDLIB_STABLE_ABI=On. if(SWIFTFILE_IS_STDLIB AND SWIFT_STDLIB_STABLE_ABI) list(APPEND swift_flags "-enable-library-evolution")