Turn off SWIFT_ENABLE_REFLECTION on the stdlib_minimal preset (#39030)

kubamracek · web-flow · commit 8b189d99e4c1 · 2021-09-12T18:54:53.000-07:00
diff --git a/stdlib/private/StdlibUnittest/CMakeLists.txt b/stdlib/private/StdlibUnittest/CMakeLists.txt
@@ -10,6 +10,10 @@ if (NOT IS_BUILD_TYPE_OPTIMIZED)
   list(APPEND swift_stdlib_unittest_compile_flags "-DSWIFT_STDLIB_DEBUG")
 endif()
 
+if(SWIFT_ENABLE_REFLECTION)
+  list(APPEND swift_stdlib_unittest_compile_flags "-DSWIFT_ENABLE_REFLECTION")
+endif()
+
 set(swift_stdlib_unittest_link_libraries "")
 set(swift_stdlib_unittest_modules "")
 if (SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY)
diff --git a/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift b/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift
@@ -294,3 +294,11 @@ public struct LinearCongruentialGenerator: RandomNumberGenerator {
     return _state
   }
 }
+
+#if !SWIFT_ENABLE_REFLECTION
+
+public func dump<T, TargetStream: TextOutputStream>(_ value: T, to target: inout TargetStream) {
+  target.write("(reflection not available)")
+}
+
+#endif
diff --git a/stdlib/public/Platform/CMakeLists.txt b/stdlib/public/Platform/CMakeLists.txt
@@ -11,6 +11,11 @@ if(NOT BUILD_STANDALONE)
   list(APPEND darwin_depends copy_apinotes)
 endif()
 
+set(swift_platform_compile_flags)
+if(SWIFT_ENABLE_REFLECTION)
+  list(APPEND swift_platform_compile_flags "-DSWIFT_ENABLE_REFLECTION")
+endif()
+
 set(swiftDarwin_target_sdks ALL_APPLE_PLATFORMS)
 if(SWIFT_FREESTANDING_FLAVOR STREQUAL "apple")
   set(swiftDarwin_target_sdks ALL_APPLE_PLATFORMS FREESTANDING)
@@ -30,6 +35,7 @@ add_swift_target_library(swiftDarwin ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_
       ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}
       ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
       -Xfrontend -disable-objc-attr-requires-foundation-module
+      ${swift_platform_compile_flags}
     LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
     TARGET_SDKS "${swiftDarwin_target_sdks}"
     INSTALL_IN_COMPONENT sdk-overlay
@@ -51,6 +57,7 @@ add_swift_target_library(swiftGlibc ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_O
     SWIFT_COMPILE_FLAGS
       ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}
       ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
+      ${swift_platform_compile_flags}
     LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
     TARGET_SDKS "${swiftGlibc_target_sdks}"
     INSTALL_IN_COMPONENT sdk-overlay
@@ -68,6 +75,7 @@ add_swift_target_library(swiftCRT ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVE
       ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}
       ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
       -Xcc -D_USE_MATH_DEFINES
+      ${swift_platform_compile_flags}
     LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
     TARGET_SDKS WINDOWS
     INSTALL_IN_COMPONENT sdk-overlay)
diff --git a/stdlib/public/Platform/Platform.swift b/stdlib/public/Platform/Platform.swift
@@ -46,12 +46,14 @@ public struct DarwinBoolean : ExpressibleByBooleanLiteral {
   }
 }
 
+#if SWIFT_ENABLE_REFLECTION
 extension DarwinBoolean : CustomReflectable {
   /// Returns a mirror that reflects `self`.
   public var customMirror: Mirror {
     return Mirror(reflecting: boolValue)
   }
 }
+#endif
 
 extension DarwinBoolean : CustomStringConvertible {
   /// A textual representation of `self`.
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
@@ -97,6 +97,9 @@ if "@SWIFT_OPTIMIZED@" == "TRUE":
 if "@SWIFT_STDLIB_SINGLE_THREADED_RUNTIME@" == "TRUE":
     config.available_features.add("single_threaded_runtime")
 
+if "@SWIFT_ENABLE_REFLECTION@" == "TRUE":
+    config.available_features.add("reflection")
+
 if "@SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS@" == "TRUE":
     config.available_features.add('runtime_function_counters')
 
diff --git a/test/stdlib/DebuggerSupport.swift b/test/stdlib/DebuggerSupport.swift
@@ -1,6 +1,7 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/Error.swift b/test/stdlib/Error.swift
@@ -3,6 +3,7 @@
 // RUN: %target-codesign %t/Error
 // RUN: %target-run %t/Error
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/ForEachField.swift b/test/stdlib/ForEachField.swift
@@ -12,6 +12,7 @@
 
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 @_spi(Reflection) import Swift
 import StdlibUnittest
diff --git a/test/stdlib/Mirror.swift b/test/stdlib/Mirror.swift
@@ -24,6 +24,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: shell
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/Optional.swift b/test/stdlib/Optional.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import Swift
diff --git a/test/stdlib/Print.swift b/test/stdlib/Print.swift
@@ -4,6 +4,7 @@
 // RUN: %target-codesign %t/main
 // RUN: %target-run %t/main
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import PrintTestTypes
diff --git a/test/stdlib/PrintArray.swift b/test/stdlib/PrintArray.swift
@@ -4,6 +4,7 @@
 // RUN: %target-codesign %t/main
 // RUN: %target-run %t/main
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import PrintTestTypes
diff --git a/test/stdlib/PrintBoolean.swift b/test/stdlib/PrintBoolean.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/PrintClass.swift b/test/stdlib/PrintClass.swift
@@ -4,6 +4,7 @@
 // RUN: %target-codesign %t/main
 // RUN: %target-run %t/main
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import PrintTestTypes
diff --git a/test/stdlib/PrintDictionary.swift b/test/stdlib/PrintDictionary.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/PrintInteger.swift b/test/stdlib/PrintInteger.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/PrintPointer.swift b/test/stdlib/PrintPointer.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/PrintSet.swift b/test/stdlib/PrintSet.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/PrintString.swift b/test/stdlib/PrintString.swift
@@ -4,6 +4,7 @@
 // RUN: %target-codesign %t/main
 // RUN: %target-run %t/main
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import PrintTestTypes
diff --git a/test/stdlib/PrintStruct.swift b/test/stdlib/PrintStruct.swift
@@ -4,6 +4,7 @@
 // RUN: %target-codesign %t/main
 // RUN: %target-run %t/main
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import PrintTestTypes
diff --git a/test/stdlib/PrintTuple.swift b/test/stdlib/PrintTuple.swift
@@ -4,6 +4,7 @@
 // RUN: %target-codesign %t/main
 // RUN: %target-run %t/main
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import PrintTestTypes
diff --git a/test/stdlib/Reflection.swift b/test/stdlib/Reflection.swift
@@ -3,6 +3,7 @@
 // RUN: %target-codesign %t/a.out
 // RUN: %{python} %S/../Inputs/timeout.py 360 %target-run %t/a.out | %FileCheck %s
 // REQUIRES: executable_test
+// REQUIRES: reflection
 // FIXME: timeout wrapper is necessary because the ASan test runs for hours
 
 //
diff --git a/test/stdlib/ReflectionHashing.swift b/test/stdlib/ReflectionHashing.swift
@@ -2,6 +2,7 @@
 // RUN: %target-codesign %t.out
 // RUN: %target-run %t.out
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 // This file contains reflection tests that depend on hash values.
 // Don't add other tests here.
diff --git a/test/stdlib/Runtime.swift.gyb b/test/stdlib/Runtime.swift.gyb
@@ -5,6 +5,7 @@
 // RUN: %target-codesign %t.out
 // RUN: %target-run %t.out
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import Swift
 import StdlibUnittest
diff --git a/test/stdlib/RuntimeRetroactiveConformance.swift b/test/stdlib/RuntimeRetroactiveConformance.swift
@@ -6,6 +6,7 @@
 // RUN: %target-run %t/a.out
 
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import A
 import B
diff --git a/test/stdlib/StaticString.swift b/test/stdlib/StaticString.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/StringAPI.swift b/test/stdlib/StringAPI.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 //
 // Tests for the non-Foundation API of String
diff --git a/test/stdlib/StringCompatibility.swift b/test/stdlib/StringCompatibility.swift
@@ -2,6 +2,7 @@
 // RUN: %target-build-swift %s -o %t/a.out4 -swift-version 4 && %target-codesign %t/a.out4 && %target-run %t/a.out4
 
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/StringDescribing.swift b/test/stdlib/StringDescribing.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/UnicodeMetadata.swift b/test/stdlib/UnicodeMetadata.swift
@@ -2,6 +2,7 @@
 // RUN: %target-codesign %t.out
 // RUN: %target-run %t.out | %FileCheck %s
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 
 class myClass { }
diff --git a/test/stdlib/UnsafePointer.swift.gyb b/test/stdlib/UnsafePointer.swift.gyb
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/WeakMirror.swift b/test/stdlib/WeakMirror.swift
@@ -23,6 +23,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: shell
+// REQUIRES: reflection
 
 import StdlibUnittest
 
diff --git a/test/stdlib/integer_conversions.swift b/test/stdlib/integer_conversions.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift | %FileCheck %s
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 var a : Int
 
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
@@ -2452,7 +2452,7 @@ build-swift-dynamic-stdlib=0
 build-swift-static-stdlib=1
 swift-objc-interop=0
 swift-enable-compatibility-overrides=0
-swift-enable-reflection=1
+swift-enable-reflection=0
 swift-runtime-macho-no-dyld=1
 swift-stdlib-has-darwin-libmalloc=0
 swift-stdlib-single-threaded-runtime=1
diff --git a/validation-test/stdlib/AnyHashable.swift.gyb b/validation-test/stdlib/AnyHashable.swift.gyb
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 // FIXME(id-as-any): make Swift errors boxed in NSError eagerly bridged.
 
diff --git a/validation-test/stdlib/Array.swift.gyb b/validation-test/stdlib/Array.swift.gyb
@@ -1,5 +1,6 @@
 // RUN: %enable-cow-checking %target-run-simple-swiftgyb
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import StdlibCollectionUnittest
diff --git a/validation-test/stdlib/ArraySlice.swift.gyb b/validation-test/stdlib/ArraySlice.swift.gyb
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import StdlibCollectionUnittest
diff --git a/validation-test/stdlib/ContiguousArray.swift.gyb b/validation-test/stdlib/ContiguousArray.swift.gyb
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import StdlibCollectionUnittest
diff --git a/validation-test/stdlib/HashingRandomization.swift b/validation-test/stdlib/HashingRandomization.swift
@@ -15,7 +15,7 @@
 // environment variable is set.
 
 print("Deterministic: \(Hasher._isDeterministic)")
-print("Seed: \(Hasher._executionSeed)")
+print("Seed: (\(Hasher._executionSeed.0), \(Hasher._executionSeed.1))")
 print("Hash values: <\(0.hashValue), \(1.hashValue)>")
 
 // With randomized hashing, we get a new seed and a new set of hash values on
diff --git a/validation-test/stdlib/Lazy.swift.gyb b/validation-test/stdlib/Lazy.swift.gyb
@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 // RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 // With a non-optimized stdlib the test takes very long.
 // REQUIRES: optimized_stdlib
diff --git a/validation-test/stdlib/NewArray.swift.gyb b/validation-test/stdlib/NewArray.swift.gyb
@@ -16,6 +16,7 @@
 // RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out 2>&1 | %line-directive %t/NewArray.swift -- %FileCheck %t/NewArray.swift --check-prefix=CHECK --check-prefix=CHECK-%target-runtime
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import StdlibCollectionUnittest
diff --git a/validation-test/stdlib/Prototypes/PersistentVector.swift.gyb b/validation-test/stdlib/Prototypes/PersistentVector.swift.gyb
@@ -4,6 +4,7 @@
 // RUN: %target-codesign %t/a.out
 // RUN: %line-directive %t/PersistentVector.swift -- %target-run %t/a.out
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 /*
 
diff --git a/validation-test/stdlib/Range.swift.gyb b/validation-test/stdlib/Range.swift.gyb
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
+// REQUIRES: reflection
 
 import StdlibUnittest
 import StdlibCollectionUnittest

Original file line number	Diff line number	Diff line change
`@@ -294,3 +294,11 @@ public struct LinearCongruentialGenerator: RandomNumberGenerator {`
`294`	`294`	`return _state`
`295`	`295`	`}`
`296`	`296`	`}`
	`297`	`+`
	`298`	`+#if !SWIFT_ENABLE_REFLECTION`
	`299`	`+`
	`300`	`+public func dump<T, TargetStream: TextOutputStream>(_ value: T, to target: inout TargetStream) {`
	`301`	`+ target.write("(reflection not available)")`
	`302`	`+}`
	`303`	`+`
	`304`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,14 @@ public struct DarwinBoolean : ExpressibleByBooleanLiteral {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
	`49`	`+#if SWIFT_ENABLE_REFLECTION`
`49`	`50`	`extension DarwinBoolean : CustomReflectable {`
`50`	`51`	/// Returns a mirror that reflects `self`.
`51`	`52`	`public var customMirror: Mirror {`
`52`	`53`	`return Mirror(reflecting: boolValue)`
`53`	`54`	`}`
`54`	`55`	`}`
	`56`	`+#endif`
`55`	`57`
`56`	`58`	`extension DarwinBoolean : CustomStringConvertible {`
`57`	`59`	/// A textual representation of `self`.