Make pointer bounds non-experimental

Author: hnrklssn

CMakeLists.txt

@@ -747,10 +747,6 @@ option(SWIFT_ENABLE_EXPERIMENTAL_PARSER_VALIDATION
   "Enable experimental SwiftParser validation by default"
   FALSE)
 
-option(SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS
-  "Enable experimental safe wrappers around external functions"
-  FALSE)
-
 cmake_dependent_option(SWIFT_BUILD_SOURCEKIT
   "Build SourceKit" TRUE
   "SWIFT_ENABLE_DISPATCH" FALSE)
@@ -1403,7 +1399,6 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "Observation Support:                ${SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION}")
   message(STATUS "Synchronization Support:            ${SWIFT_ENABLE_SYNCHRONIZATION}")
   message(STATUS "Volatile Support:                   ${SWIFT_ENABLE_VOLATILE}")
-  message(STATUS "Pointer Bounds Support:             ${SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS}")
   message(STATUS "")
 else()
   message(STATUS "Not building Swift standard library, SDK overlays, and runtime")

Runtimes/Core/CMakeLists.txt

@@ -28,7 +28,6 @@
 # Catalyst Support
 #   -- Will need shadow invocations to generate swiftmodules for Swift parts
 # Install *.abi.json, swiftdoc, and swiftsourceinfo
-# Pointer bounds (SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS)
 
 cmake_minimum_required(VERSION 3.26...3.29)
 

include/swift/Option/Options.td

@@ -792,11 +792,6 @@ def enable_experimental_concise_pound_file : Flag<["-"],
   Flags<[FrontendOption, ModuleInterfaceOption]>,
   HelpText<"Enable experimental concise '#file' identifier">;
 
-def enable_experimental_bounds_safety_interop :
-  Flag<["-"], "enable-experimental-bounds-safety-interop">,
-  Flags<[NoDriverOption, FrontendOption, HelpHidden, ModuleInterfaceOption]>,
-  HelpText<"Enable experimental C bounds safety interop code generation and config directives">;
-
 def enable_experimental_cxx_interop :
   Flag<["-"], "enable-experimental-cxx-interop">,
   Flags<[NoDriverOption, FrontendOption, HelpHidden]>,

stdlib/cmake/modules/SwiftSource.cmake

@@ -326,10 +326,6 @@ function(_add_target_variant_swift_compile_flags
     list(APPEND result "-D" "SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION")
   endif()
 
-  if(SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS)
-    list(APPEND result "-D" "SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS")
-  endif()
-
   if(SWIFT_ENABLE_SYNCHRONIZATION)
     list(APPEND result "-D" "SWIFT_ENABLE_SYNCHRONIZATION")
   endif()

stdlib/public/core/CMakeLists.txt

@@ -230,6 +230,7 @@ split_embedded_sources(
   EMBEDDED Int128.swift
   EMBEDDED Mirror.swift
     NORMAL PlaygroundDisplay.swift
+  EMBEDDED PointerBounds.swift
     NORMAL CommandLine.swift
   EMBEDDED SliceBuffer.swift
   EMBEDDED StaticBigInt.swift
@@ -263,11 +264,6 @@ if(SWIFT_STDLIB_ENABLE_VECTOR_TYPES)
   list(APPEND SWIFTLIB_EMBEDDED_GYB_SOURCES SIMDConcreteOperations.swift.gyb SIMDVectorTypes.swift.gyb)
 endif()
 
-if (SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS)
-  list(APPEND SWIFTLIB_SOURCES PointerBounds.swift)
-  list(APPEND SWIFTLIB_EMBEDDED_SOURCES PointerBounds.swift)
-endif()
-
 # Freestanding and Linux/Android builds both have failures to resolve.
 if(NOT BOOTSTRAPPING_MODE STREQUAL "OFF" AND NOT SWIFT_FREESTANDING_FLAVOR AND NOT SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" AND NOT SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")
   list(APPEND SWIFTLIB_SOURCES ObjectIdentifier+DebugDescription.swift)

test/CMakeLists.txt

@@ -457,10 +457,6 @@ foreach(SDK ${SWIFT_SDKS})
           list(APPEND LIT_ARGS "--param" "string_processing")
         endif()
 
-        if(SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS)
-          list(APPEND LIT_ARGS "--param" "pointer_bounds")
-        endif()
-
         if(SWIFT_ENABLE_BACKTRACING)
           list(APPEND LIT_ARGS "--param" "backtracing")
         endif()

test/Interop/C/pointer-bounds/counted-by.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_feature_SafeInteropWrappers
-// REQUIRES: pointer_bounds
 
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend -emit-module -disable-availability-checking -plugin-path %swift-plugin-dir -o %t/CountedBy.swiftmodule -I %S/Inputs -enable-experimental-feature SafeInteropWrappers %s

test/Macros/PointerBounds/CountedBy/CountExpr.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/CountedBy/MultipleParams.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/CountedBy/Mutable.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/CountedBy/MutableSpan.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 // REQUIRES: swift_feature_Span
 
 // RUN: not %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions -enable-experimental-feature Span > %t.log 2>&1

test/Macros/PointerBounds/CountedBy/Nullable.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/CountedBy/QualifiedTypes.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/CountedBy/Return.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/CountedBy/SharedCount.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/CountedBy/SimpleCount.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/CountedBy/SimpleSpan.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 // REQUIRES: swift_feature_Span
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions -enable-experimental-feature Span 2>&1 | %FileCheck --match-full-lines %s

test/Macros/PointerBounds/CountedBy/SimpleSpanWithReturn.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 // REQUIRES: swift_feature_Span
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions -enable-experimental-feature Span 2>&1 | %FileCheck --match-full-lines %s

test/Macros/PointerBounds/CountedBy/Unwrapped.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/MacroErrors/ArrayType.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 

test/Macros/PointerBounds/MacroErrors/DynamicCountExpr.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 

test/Macros/PointerBounds/MacroErrors/DynamicEnum.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 

test/Macros/PointerBounds/MacroErrors/DynamicPointerIndex.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 

test/Macros/PointerBounds/MacroErrors/InvalidCount.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 

test/Macros/PointerBounds/MacroErrors/PointerIndexOutOfBounds.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 

test/Macros/PointerBounds/MacroErrors/SamePointer.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir
 

test/Macros/PointerBounds/MacroErrors/UnexpectedCountExpr.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 

test/Macros/PointerBounds/MacroErrors/UnexpectedCountType.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // XFAIL: *
 

test/Macros/PointerBounds/MacroErrors/UnexpectedPointerType.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-typecheck-verify-swift -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 

test/Macros/PointerBounds/SizedBy/MultipleParams.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/SizedBy/Mutable.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/SizedBy/MutableRawSpan.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 // REQUIRES: swift_feature_Span
 
 // RUN: not %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions -enable-experimental-feature Span > %t.log 2>&1

test/Macros/PointerBounds/SizedBy/Nullable.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/SizedBy/Return.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/SizedBy/SharedCount.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/SizedBy/SimpleRawSpan.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 // REQUIRES: swift_feature_Span
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions -enable-experimental-feature Span 2>&1 | %FileCheck --match-full-lines %s

test/Macros/PointerBounds/SizedBy/SimpleRawSpanWithReturn.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 // REQUIRES: swift_feature_Span
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions -enable-experimental-feature Span 2>&1 | %FileCheck --match-full-lines %s

test/Macros/PointerBounds/SizedBy/SimpleSize.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/SizedBy/SizeExpr.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/Macros/PointerBounds/SizedBy/Unwrapped.swift

@@ -1,5 +1,4 @@
 // REQUIRES: swift_swift_parser
-// REQUIRES: pointer_bounds
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck --match-full-lines %s
 

test/lit.site.cfg.in

@@ -156,8 +156,6 @@ if "@SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING@" == "TRUE":
     config.available_features.add('string_processing')
 if "@SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION@" == "TRUE":
     config.available_features.add('observation')
-if "@SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS@" == "TRUE":
-    config.available_features.add('pointer_bounds')
 if "@SWIFT_STDLIB_ENABLE_DEBUG_PRECONDITIONS_IN_RELEASE@" == "TRUE":
     config.available_features.add('swift_stdlib_debug_preconditions_in_release')
 if "@SWIFT_ENABLE_VOLATILE@" == "TRUE":

utils/build-script-impl

@@ -2092,13 +2092,6 @@ for host in "${ALL_HOSTS[@]}"; do
                     )
                 fi
 
-                if [[ "${SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS}" ]] ; then
-                    cmake_options=(
-                        "${cmake_options[@]}"
-                        -DSWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS:BOOL=$(true_false "${SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS}")
-                    )
-                fi
-
                 # SWIFT_THREADING_PACKAGE can be:
                 #
                 #    - Empty

utils/build.ps1

@@ -1524,7 +1524,6 @@ function Build-Compilers() {
         SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED = "YES";
         SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION = "YES";
         SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING = "YES";
-        SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS = "YES";
         SWIFT_ENABLE_SYNCHRONIZATION = "YES";
         SWIFT_ENABLE_VOLATILE = "YES";
         SWIFT_PATH_TO_LIBDISPATCH_SOURCE = "$SourceCache\swift-corelibs-libdispatch";
@@ -1835,7 +1834,6 @@ function Build-Runtime([Platform]$Platform, $Arch) {
         SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED = "YES";
         SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION = "YES";
         SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING = "YES";
-        SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS = "YES";
         SWIFT_ENABLE_SYNCHRONIZATION = "YES";
         SWIFT_ENABLE_VOLATILE = "YES";
         SWIFT_NATIVE_SWIFT_TOOLS_PATH = (Join-Path -Path $CompilersBinaryCache -ChildPath "bin");

utils/build_swift/build_swift/driver_arguments.py

@@ -1493,10 +1493,6 @@ def create_argument_parser():
            default=True,
            help='Enable experimental Swift Parser validation by default.')
 
-    option('--enable-experimental-pointer-bounds', toggle_true,
-           default=False,
-           help='Enable experimental bounds safe C interop.')
-
     # -------------------------------------------------------------------------
     in_group('Unsupported options')
 

utils/build_swift/tests/expected_options.py

@@ -184,7 +184,6 @@
     'enable_experimental_string_processing': True,
     'enable_experimental_observation': True,
     'enable_experimental_parser_validation': True,
-    'enable_experimental_pointer_bounds': False,
     'swift_enable_backtracing': True,
     'enable_synchronization': True,
     'enable_volatile': True,
@@ -628,7 +627,6 @@ class BuildScriptImplOption(_BaseOption):
     EnableOption('--enable-experimental-string-processing'),
     EnableOption('--enable-experimental-observation'),
     EnableOption('--enable-experimental-parser-validation'),
-    EnableOption('--enable-experimental-pointer-bounds'),
     EnableOption('--enable-lsan'),
     EnableOption('--enable-sanitize-coverage'),
     EnableOption('--enable-tsan'),

utils/swift_build_support/swift_build_support/products/minimalstdlib.py

@@ -104,8 +104,6 @@ def build(self, host_target):
             'SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED:BOOL', 'FALSE')
         self.cmake_options.define(
             'SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL', 'FALSE')
-        self.cmake_options.define(
-            'SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS:BOOL', 'FALSE')
         self.cmake_options.define('SWIFT_ENABLE_REFLECTION:BOOL', 'FALSE')
         self.cmake_options.define(
             'SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS:BOOL', 'FALSE')

utils/swift_build_support/swift_build_support/products/swift.py

@@ -57,9 +57,6 @@ def __init__(self, args, toolchain, source_dir, build_dir):
         self.cmake_options.extend(self._enable_experimental_cxx_interop)
         self.cmake_options.extend(self._enable_cxx_interop_swift_bridging_header)
 
-        # Add experimental c interop flag.
-        self.cmake_options.extend(self._enable_experimental_pointer_bounds)
-
         # Add experimental distributed flag.
         self.cmake_options.extend(self._enable_experimental_distributed)
 
@@ -218,11 +215,6 @@ def _enable_experimental_observation(self):
         return [('SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL',
                  self.args.enable_experimental_observation)]
 
-    @property
-    def _enable_experimental_pointer_bounds(self):
-        return [('SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS:BOOL',
-                 self.args.enable_experimental_pointer_bounds)]
-
     @property
     def _enable_synchronization(self):
         return [('SWIFT_ENABLE_SYNCHRONIZATION:BOOL',

utils/swift_build_support/swift_build_support/products/wasmstdlib.py

@@ -164,8 +164,6 @@ def _build_stdlib(self, host_target, target_triple, llvm_cmake_dir):
         self.cmake_options.define('SWIFT_ENABLE_SYNCHRONIZATION:BOOL', 'TRUE')
         self.cmake_options.define('SWIFT_ENABLE_VOLATILE:BOOL', 'TRUE')
         self.cmake_options.define('SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL', 'TRUE')
-        self.cmake_options.define('SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS:BOOL',
-                                  'TRUE')
 
         self.add_extra_cmake_options()