Stop building Reflection

Azoy · Azoy · commit 09b1476ddf42 · 2023-03-14T11:49:38.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -614,10 +614,6 @@ option(SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING
   "Enable experimental string processing"
   FALSE)
 
-option(SWIFT_ENABLE_EXPERIMENTAL_REFLECTION
-  "Enable build of the Swift reflection module"
-  FALSE)
-
 option(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION
   "Enable build of the Swift observation module"
   FALSE)
@@ -1180,7 +1176,6 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "String Processing Support:          ${SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING}")
   message(STATUS "Backtracing Support:                ${SWIFT_ENABLE_BACKTRACING}")
   message(STATUS "Unicode Support:                    ${SWIFT_STDLIB_ENABLE_UNICODE_DATA}")
-  message(STATUS "Reflection Support:                 ${SWIFT_ENABLE_EXPERIMENTAL_REFLECTION}")
   message(STATUS "Observation Support:                ${SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION}")
   message(STATUS "")
 else()
diff --git a/stdlib/cmake/modules/SwiftSource.cmake b/stdlib/cmake/modules/SwiftSource.cmake
@@ -295,10 +295,6 @@ function(_add_target_variant_swift_compile_flags
     list(APPEND result "-D" "SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING")
   endif()
 
-  if(SWIFT_ENABLE_EXPERIMENTAL_REFLECTION)
-    list(APPEND result "-D" "SWIFT_ENABLE_EXPERIMENTAL_REFLECTION")
-  endif()
-
   if(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
     list(APPEND result "-D" "SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION")
   endif()
diff --git a/stdlib/public/CMakeLists.txt b/stdlib/public/CMakeLists.txt
@@ -151,10 +151,6 @@ if(SWIFT_BUILD_STDLIB)
     add_subdirectory(RegexBuilder)
   endif()
 
-  if(SWIFT_ENABLE_EXPERIMENTAL_REFLECTION)
-    add_subdirectory(Reflection)
-  endif()
-
   if(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
     add_subdirectory(Observation)
   endif()
diff --git a/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt b/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt
@@ -25,7 +25,6 @@ set(sources
   _SwiftBacktracing.h
   _SwiftConcurrency.h
   _SwiftDistributed.h
-  _SwiftRuntime.h
 
   module.modulemap
   )
diff --git a/stdlib/public/SwiftShims/swift/shims/_SwiftRuntime.h b/stdlib/public/SwiftShims/swift/shims/_SwiftRuntime.h
diff --git a/stdlib/public/SwiftShims/swift/shims/module.modulemap b/stdlib/public/SwiftShims/swift/shims/module.modulemap
@@ -34,8 +34,3 @@ module SwiftOverlayShims {
   header "LibcOverlayShims.h"
   export *
 }
-
-module _SwiftRuntimeShims {
-  header "_SwiftRuntime.h"
-  export *
-}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -189,7 +189,6 @@ normalize_boolean_spelling(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY)
 normalize_boolean_spelling(SWIFT_BACK_DEPLOY_CONCURRENCY)
 normalize_boolean_spelling(SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED)
 normalize_boolean_spelling(SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING)
-normalize_boolean_spelling(SWIFT_ENABLE_EXPERIMENTAL_REFLECTION)
 normalize_boolean_spelling(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
 normalize_boolean_spelling(SWIFT_ENABLE_MACCATALYST)
 normalize_boolean_spelling(SWIFT_RUN_TESTS_WITH_HOST_COMPILER)
@@ -395,10 +394,6 @@ foreach(SDK ${SWIFT_SDKS})
           list(APPEND LIT_ARGS "--param" "backtracing")
         endif()
 
-        if(SWIFT_ENABLE_EXPERIMENTAL_REFLECTION)
-          list(APPEND LIT_ARGS "--param" "reflection")
-        endif()
-
         if(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
           list(APPEND LIT_ARGS "--param" "observation")
         endif()
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
@@ -140,8 +140,6 @@ if "@SWIFT_STDLIB_ENABLE_UNICODE_DATA" == "TRUE":
     config.available_features.add('stdlib_unicode_data')
 if "@SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING@" == "TRUE":
     config.available_features.add('string_processing')
-if "@SWIFT_ENABLE_EXPERIMENTAL_REFLECTION@" == "TRUE":
-    config.available_features.add('reflection_runtime')
 if "@SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION@" == "TRUE":
     config.available_features.add('observation')
 if "@SWIFT_STDLIB_ENABLE_DEBUG_PRECONDITIONS_IN_RELEASE@" == "TRUE":
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
@@ -2560,7 +2560,6 @@ enable-experimental-differentiable-programming=0
 swift-enable-experimental-string-processing=0
 enable-experimental-concurrency=1
 enable-experimental-distributed=0
-enable-experimental-reflection=0
 enable-experimental-observation=0
 build-swift-dynamic-sdk-overlay=0
 build-swift-dynamic-stdlib=0
@@ -2676,7 +2675,6 @@ build-subdir=stdlib_S_standalone_darwin
 enable-experimental-differentiable-programming=0
 enable-experimental-concurrency=0
 enable-experimental-distributed=0
-enable-experimental-reflection=0
 enable-experimental-observation=0
 
 stdlib-deployment-targets=freestanding-x86_64
diff --git a/utils/build-windows-toolchain.bat b/utils/build-windows-toolchain.bat
@@ -215,7 +215,6 @@ cmake ^
   -D SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=YES ^
   -D SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES ^
   -D SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES ^
-  -D SWIFT_ENABLE_EXPERIMENTAL_REFLECTION=YES ^
   -D SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION=YES ^
 
   -D LLVM_EXTERNAL_SWIFT_SOURCE_DIR="%SourceRoot%\swift" ^
@@ -258,7 +257,6 @@ cmake ^
   -D SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=YES ^
   -D SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES ^
   -D SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES ^
-  -D SWIFT_ENABLE_EXPERIMENTAL_REFLECTION=YES ^
   -D SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION=YES ^
 
   -G Ninja ^
diff --git a/utils/build-windows.bat b/utils/build-windows.bat
@@ -265,7 +265,6 @@ cmake^
     -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=YES^
     -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES^
     -DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES^
-    -DSWIFT_ENABLE_EXPERIMENTAL_REFLECTION=YES^
     -DSWIFT_ENABLE_EXPERIMENTAL_OBSERVATION=YES^
     -DSWIFT_INSTALL_COMPONENTS="autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;editor-integration;tools;testsuite-tools;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers"^
     -DSWIFT_PARALLEL_LINK_JOBS=8^
diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py
@@ -1319,9 +1319,6 @@ def create_argument_parser():
            default=True,
            help='Enable experimental Swift string processing.')
 
-    option('--enable-experimental-reflection', toggle_true,
-           default=True,
-           help='Enable experimental Swift reflection.')
     option('--enable-experimental-observation', toggle_true,
            default=True,
            help='Enable experimental Swift observation.')
diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py
@@ -161,7 +161,6 @@
     'enable_experimental_concurrency': True,
     'enable_experimental_distributed': True,
     'enable_experimental_string_processing': True,
-    'enable_experimental_reflection': True,
     'enable_experimental_observation': True,
     'swift_enable_backtracing': True,
     'enable_lsan': False,
@@ -577,7 +576,6 @@ class BuildScriptImplOption(_BaseOption):
     EnableOption('--enable-experimental-concurrency'),
     EnableOption('--enable-experimental-distributed'),
     EnableOption('--enable-experimental-string-processing'),
-    EnableOption('--enable-experimental-reflection'),
     EnableOption('--enable-experimental-observation'),
     EnableOption('--enable-lsan'),
     EnableOption('--enable-sanitize-coverage'),
diff --git a/utils/swift-api-dump.py b/utils/swift-api-dump.py
@@ -106,8 +106,6 @@ def create_parser():
                         help='Enable experimental distributed actors.')
     parser.add_argument('--enable-experimental-string-processing', action='store_true',
                         help='Enable experimental string processing.')
-    parser.add_argument('--enable-experimental-reflection', action='store_true',
-                        help='Enable experimental reflection.')
     parser.add_argument('--enable-experimental-observation', action='store_true',
                         help='Enable experimental observation.')
     parser.add_argument('-swift-version', metavar='N',
diff --git a/utils/swift_build_support/swift_build_support/products/swift.py b/utils/swift_build_support/swift_build_support/products/swift.py
@@ -58,9 +58,6 @@ def __init__(self, args, toolchain, source_dir, build_dir):
         # Add backtracing flag.
         self.cmake_options.extend(self._enable_backtracing)
 
-        # Add experimental reflection flag.
-        self.cmake_options.extend(self._enable_experimental_reflection)
-
         # Add experimental observation flag.
         self.cmake_options.extend(self._enable_experimental_observation)
 
@@ -181,11 +178,6 @@ def _enable_backtracing(self):
         return [('SWIFT_ENABLE_BACKTRACING:BOOL',
                  self.args.swift_enable_backtracing)]
 
-    @property
-    def _enable_experimental_reflection(self):
-        return [('SWIFT_ENABLE_EXPERIMENTAL_REFLECTION:BOOL',
-                 self.args.enable_experimental_reflection)]
-
     @property
     def _enable_experimental_observation(self):
         return [('SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL',
diff --git a/utils/swift_build_support/tests/products/test_swift.py b/utils/swift_build_support/tests/products/test_swift.py
@@ -56,7 +56,6 @@ def setUp(self):
             enable_experimental_differentiable_programming=False,
             enable_experimental_concurrency=False,
             enable_experimental_distributed=False,
-            enable_experimental_reflection=False,
             enable_experimental_observation=False,
             swift_enable_backtracing=False,
             build_early_swiftsyntax=False,
@@ -98,7 +97,6 @@ def test_by_default_no_cmake_options(self):
             '-DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING:BOOL=FALSE',
             '-DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY:BOOL=FALSE',
             '-DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED:BOOL=FALSE',
-            '-DSWIFT_ENABLE_EXPERIMENTAL_REFLECTION:BOOL=FALSE',
             '-DSWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL=FALSE',
             '-DSWIFT_ENABLE_BACKTRACING:BOOL=FALSE',
             '-DSWIFT_STDLIB_STATIC_PRINT=FALSE',
@@ -124,7 +122,6 @@ def test_swift_runtime_tsan(self):
             '-DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING:BOOL=FALSE',
             '-DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY:BOOL=FALSE',
             '-DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED:BOOL=FALSE',
-            '-DSWIFT_ENABLE_EXPERIMENTAL_REFLECTION:BOOL=FALSE',
             '-DSWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL=FALSE',
             '-DSWIFT_ENABLE_BACKTRACING:BOOL=FALSE',
             '-DSWIFT_STDLIB_STATIC_PRINT=FALSE',
@@ -371,19 +368,6 @@ def test_experimental_distributed_flags(self):
             [x for x in swift.cmake_options
              if 'DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED' in x])
 
-    def test_experimental_reflection_flags(self):
-        self.args.enable_experimental_reflection = True
-        swift = Swift(
-            args=self.args,
-            toolchain=self.toolchain,
-            source_dir='/path/to/src',
-            build_dir='/path/to/build')
-        self.assertEqual(
-            ['-DSWIFT_ENABLE_EXPERIMENTAL_REFLECTION:BOOL='
-             'TRUE'],
-            [x for x in swift.cmake_options
-             if 'DSWIFT_ENABLE_EXPERIMENTAL_REFLECTION' in x])
-
     def test_experimental_observation_flags(self):
         self.args.enable_experimental_observation = True
         swift = Swift(
diff --git a/validation-test/lit.site.cfg.in b/validation-test/lit.site.cfg.in
@@ -130,8 +130,6 @@ if "@SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED@" == "TRUE":
     config.available_features.add('distributed')
 if "@SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING@" == "TRUE":
     config.available_features.add('string_processing')
-if "@SWIFT_ENABLE_EXPERIMENTAL_REFLECTION@" == "TRUE":
-    config.available_features.add('reflection_runtime')
 if "@SWIFT_STDLIB_ENABLE_DEBUG_PRECONDITIONS_IN_RELEASE@" == "TRUE":
     config.available_features.add('swift_stdlib_debug_preconditions_in_release')
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ set(sources`
`25`	`25`	`_SwiftBacktracing.h`
`26`	`26`	`_SwiftConcurrency.h`
`27`	`27`	`_SwiftDistributed.h`
`28`		`- _SwiftRuntime.h`
`29`	`28`
`30`	`29`	`module.modulemap`
`31`	`30`	`)`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,3 @@ module SwiftOverlayShims {`
`34`	`34`	`header "LibcOverlayShims.h"`
`35`	`35`	`export *`
`36`	`36`	`}`
`37`		`-`
`38`		`-module _SwiftRuntimeShims {`
`39`		`- header "_SwiftRuntime.h"`
`40`		`- export *`
`41`		`-}`