Skip to content

Commit 09b1476

Browse files
AzoyAzoy
committed
Stop building Reflection
1 parent ad24fe1 commit 09b1476

File tree

17 files changed

+0
-86
lines changed

17 files changed

+0
-86
lines changed

‎CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -614,10 +614,6 @@ option(SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING
614614
"Enable experimental string processing"
615615
FALSE)
616616

617-
option(SWIFT_ENABLE_EXPERIMENTAL_REFLECTION
618-
"Enable build of the Swift reflection module"
619-
FALSE)
620-
621617
option(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION
622618
"Enable build of the Swift observation module"
623619
FALSE)
@@ -1180,7 +1176,6 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
11801176
message(STATUS "String Processing Support: ${SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING}")
11811177
message(STATUS "Backtracing Support: ${SWIFT_ENABLE_BACKTRACING}")
11821178
message(STATUS "Unicode Support: ${SWIFT_STDLIB_ENABLE_UNICODE_DATA}")
1183-
message(STATUS "Reflection Support: ${SWIFT_ENABLE_EXPERIMENTAL_REFLECTION}")
11841179
message(STATUS "Observation Support: ${SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION}")
11851180
message(STATUS "")
11861181
else()

‎stdlib/cmake/modules/SwiftSource.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,6 @@ function(_add_target_variant_swift_compile_flags
295295
list(APPEND result "-D" "SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING")
296296
endif()
297297

298-
if(SWIFT_ENABLE_EXPERIMENTAL_REFLECTION)
299-
list(APPEND result "-D" "SWIFT_ENABLE_EXPERIMENTAL_REFLECTION")
300-
endif()
301-
302298
if(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
303299
list(APPEND result "-D" "SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION")
304300
endif()

‎stdlib/public/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,6 @@ if(SWIFT_BUILD_STDLIB)
151151
add_subdirectory(RegexBuilder)
152152
endif()
153153

154-
if(SWIFT_ENABLE_EXPERIMENTAL_REFLECTION)
155-
add_subdirectory(Reflection)
156-
endif()
157-
158154
if(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
159155
add_subdirectory(Observation)
160156
endif()

‎stdlib/public/SwiftShims/swift/shims/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ set(sources
2525
_SwiftBacktracing.h
2626
_SwiftConcurrency.h
2727
_SwiftDistributed.h
28-
_SwiftRuntime.h
2928

3029
module.modulemap
3130
)

‎stdlib/public/SwiftShims/swift/shims/_SwiftRuntime.h

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎stdlib/public/SwiftShims/swift/shims/module.modulemap

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,3 @@ module SwiftOverlayShims {
3434
header "LibcOverlayShims.h"
3535
export *
3636
}
37-
38-
module _SwiftRuntimeShims {
39-
header "_SwiftRuntime.h"
40-
export *
41-
}

‎test/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ normalize_boolean_spelling(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY)
189189
normalize_boolean_spelling(SWIFT_BACK_DEPLOY_CONCURRENCY)
190190
normalize_boolean_spelling(SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED)
191191
normalize_boolean_spelling(SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING)
192-
normalize_boolean_spelling(SWIFT_ENABLE_EXPERIMENTAL_REFLECTION)
193192
normalize_boolean_spelling(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
194193
normalize_boolean_spelling(SWIFT_ENABLE_MACCATALYST)
195194
normalize_boolean_spelling(SWIFT_RUN_TESTS_WITH_HOST_COMPILER)
@@ -395,10 +394,6 @@ foreach(SDK ${SWIFT_SDKS})
395394
list(APPEND LIT_ARGS "--param" "backtracing")
396395
endif()
397396

398-
if(SWIFT_ENABLE_EXPERIMENTAL_REFLECTION)
399-
list(APPEND LIT_ARGS "--param" "reflection")
400-
endif()
401-
402397
if(SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION)
403398
list(APPEND LIT_ARGS "--param" "observation")
404399
endif()

‎test/lit.site.cfg.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ if "@SWIFT_STDLIB_ENABLE_UNICODE_DATA" == "TRUE":
140140
config.available_features.add('stdlib_unicode_data')
141141
if "@SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING@" == "TRUE":
142142
config.available_features.add('string_processing')
143-
if "@SWIFT_ENABLE_EXPERIMENTAL_REFLECTION@" == "TRUE":
144-
config.available_features.add('reflection_runtime')
145143
if "@SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION@" == "TRUE":
146144
config.available_features.add('observation')
147145
if "@SWIFT_STDLIB_ENABLE_DEBUG_PRECONDITIONS_IN_RELEASE@" == "TRUE":

‎utils/build-presets.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2560,7 +2560,6 @@ enable-experimental-differentiable-programming=0
25602560
swift-enable-experimental-string-processing=0
25612561
enable-experimental-concurrency=1
25622562
enable-experimental-distributed=0
2563-
enable-experimental-reflection=0
25642563
enable-experimental-observation=0
25652564
build-swift-dynamic-sdk-overlay=0
25662565
build-swift-dynamic-stdlib=0
@@ -2676,7 +2675,6 @@ build-subdir=stdlib_S_standalone_darwin
26762675
enable-experimental-differentiable-programming=0
26772676
enable-experimental-concurrency=0
26782677
enable-experimental-distributed=0
2679-
enable-experimental-reflection=0
26802678
enable-experimental-observation=0
26812679

26822680
stdlib-deployment-targets=freestanding-x86_64

‎utils/build-windows-toolchain.bat

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ cmake ^
215215
-D SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=YES ^
216216
-D SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES ^
217217
-D SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES ^
218-
-D SWIFT_ENABLE_EXPERIMENTAL_REFLECTION=YES ^
219218
-D SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION=YES ^
220219

221220
-D LLVM_EXTERNAL_SWIFT_SOURCE_DIR="%SourceRoot%\swift" ^
@@ -258,7 +257,6 @@ cmake ^
258257
-D SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=YES ^
259258
-D SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES ^
260259
-D SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES ^
261-
-D SWIFT_ENABLE_EXPERIMENTAL_REFLECTION=YES ^
262260
-D SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION=YES ^
263261

264262
-G Ninja ^

‎utils/build-windows.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ cmake^
265265
-DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=YES^
266266
-DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES^
267267
-DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES^
268-
-DSWIFT_ENABLE_EXPERIMENTAL_REFLECTION=YES^
269268
-DSWIFT_ENABLE_EXPERIMENTAL_OBSERVATION=YES^
270269
-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"^
271270
-DSWIFT_PARALLEL_LINK_JOBS=8^

‎utils/build_swift/build_swift/driver_arguments.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,9 +1319,6 @@ def create_argument_parser():
13191319
default=True,
13201320
help='Enable experimental Swift string processing.')
13211321

1322-
option('--enable-experimental-reflection', toggle_true,
1323-
default=True,
1324-
help='Enable experimental Swift reflection.')
13251322
option('--enable-experimental-observation', toggle_true,
13261323
default=True,
13271324
help='Enable experimental Swift observation.')

‎utils/build_swift/tests/expected_options.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@
161161
'enable_experimental_concurrency': True,
162162
'enable_experimental_distributed': True,
163163
'enable_experimental_string_processing': True,
164-
'enable_experimental_reflection': True,
165164
'enable_experimental_observation': True,
166165
'swift_enable_backtracing': True,
167166
'enable_lsan': False,
@@ -577,7 +576,6 @@ class BuildScriptImplOption(_BaseOption):
577576
EnableOption('--enable-experimental-concurrency'),
578577
EnableOption('--enable-experimental-distributed'),
579578
EnableOption('--enable-experimental-string-processing'),
580-
EnableOption('--enable-experimental-reflection'),
581579
EnableOption('--enable-experimental-observation'),
582580
EnableOption('--enable-lsan'),
583581
EnableOption('--enable-sanitize-coverage'),

‎utils/swift-api-dump.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ def create_parser():
106106
help='Enable experimental distributed actors.')
107107
parser.add_argument('--enable-experimental-string-processing', action='store_true',
108108
help='Enable experimental string processing.')
109-
parser.add_argument('--enable-experimental-reflection', action='store_true',
110-
help='Enable experimental reflection.')
111109
parser.add_argument('--enable-experimental-observation', action='store_true',
112110
help='Enable experimental observation.')
113111
parser.add_argument('-swift-version', metavar='N',

‎utils/swift_build_support/swift_build_support/products/swift.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ def __init__(self, args, toolchain, source_dir, build_dir):
5858
# Add backtracing flag.
5959
self.cmake_options.extend(self._enable_backtracing)
6060

61-
# Add experimental reflection flag.
62-
self.cmake_options.extend(self._enable_experimental_reflection)
63-
6461
# Add experimental observation flag.
6562
self.cmake_options.extend(self._enable_experimental_observation)
6663

@@ -181,11 +178,6 @@ def _enable_backtracing(self):
181178
return [('SWIFT_ENABLE_BACKTRACING:BOOL',
182179
self.args.swift_enable_backtracing)]
183180

184-
@property
185-
def _enable_experimental_reflection(self):
186-
return [('SWIFT_ENABLE_EXPERIMENTAL_REFLECTION:BOOL',
187-
self.args.enable_experimental_reflection)]
188-
189181
@property
190182
def _enable_experimental_observation(self):
191183
return [('SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL',

‎utils/swift_build_support/tests/products/test_swift.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ def setUp(self):
5656
enable_experimental_differentiable_programming=False,
5757
enable_experimental_concurrency=False,
5858
enable_experimental_distributed=False,
59-
enable_experimental_reflection=False,
6059
enable_experimental_observation=False,
6160
swift_enable_backtracing=False,
6261
build_early_swiftsyntax=False,
@@ -98,7 +97,6 @@ def test_by_default_no_cmake_options(self):
9897
'-DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING:BOOL=FALSE',
9998
'-DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY:BOOL=FALSE',
10099
'-DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED:BOOL=FALSE',
101-
'-DSWIFT_ENABLE_EXPERIMENTAL_REFLECTION:BOOL=FALSE',
102100
'-DSWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL=FALSE',
103101
'-DSWIFT_ENABLE_BACKTRACING:BOOL=FALSE',
104102
'-DSWIFT_STDLIB_STATIC_PRINT=FALSE',
@@ -124,7 +122,6 @@ def test_swift_runtime_tsan(self):
124122
'-DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING:BOOL=FALSE',
125123
'-DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY:BOOL=FALSE',
126124
'-DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED:BOOL=FALSE',
127-
'-DSWIFT_ENABLE_EXPERIMENTAL_REFLECTION:BOOL=FALSE',
128125
'-DSWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL=FALSE',
129126
'-DSWIFT_ENABLE_BACKTRACING:BOOL=FALSE',
130127
'-DSWIFT_STDLIB_STATIC_PRINT=FALSE',
@@ -371,19 +368,6 @@ def test_experimental_distributed_flags(self):
371368
[x for x in swift.cmake_options
372369
if 'DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED' in x])
373370

374-
def test_experimental_reflection_flags(self):
375-
self.args.enable_experimental_reflection = True
376-
swift = Swift(
377-
args=self.args,
378-
toolchain=self.toolchain,
379-
source_dir='/path/to/src',
380-
build_dir='/path/to/build')
381-
self.assertEqual(
382-
['-DSWIFT_ENABLE_EXPERIMENTAL_REFLECTION:BOOL='
383-
'TRUE'],
384-
[x for x in swift.cmake_options
385-
if 'DSWIFT_ENABLE_EXPERIMENTAL_REFLECTION' in x])
386-
387371
def test_experimental_observation_flags(self):
388372
self.args.enable_experimental_observation = True
389373
swift = Swift(

‎validation-test/lit.site.cfg.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ if "@SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED@" == "TRUE":
130130
config.available_features.add('distributed')
131131
if "@SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING@" == "TRUE":
132132
config.available_features.add('string_processing')
133-
if "@SWIFT_ENABLE_EXPERIMENTAL_REFLECTION@" == "TRUE":
134-
config.available_features.add('reflection_runtime')
135133
if "@SWIFT_STDLIB_ENABLE_DEBUG_PRECONDITIONS_IN_RELEASE@" == "TRUE":
136134
config.available_features.add('swift_stdlib_debug_preconditions_in_release')
137135

0 commit comments

Comments
 (0)