Merge pull request #38935 from al45tair/problem/37170485

[Tests] Fix a couple of type round trip test problems.

Author: al45tair

stdlib/public/CMakeLists.txt

@@ -70,14 +70,8 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_REMOTE_MIRROR)
     "${SWIFT_SOURCE_DIR}/lib/Demangling/OldDemangler.cpp"
     "${SWIFT_SOURCE_DIR}/lib/Demangling/OldRemangler.cpp"
     "${SWIFT_SOURCE_DIR}/lib/Demangling/Punycode.cpp"
-    "${SWIFT_SOURCE_DIR}/lib/Demangling/Remangler.cpp")
-
-  # When we're building with assertions, include the demangle node dumper to aid
-  # in debugging.
-  if(LLVM_ENABLE_ASSERTIONS)
-    list(APPEND swiftDemanglingSources
-      "${SWIFT_SOURCE_DIR}/lib/Demangling/NodeDumper.cpp")
-  endif()
+    "${SWIFT_SOURCE_DIR}/lib/Demangling/Remangler.cpp"
+    "${SWIFT_SOURCE_DIR}/lib/Demangling/NodeDumper.cpp")
 
   add_swift_target_library(swiftDemangling OBJECT_LIBRARY
     ${swiftDemanglingSources}

test/TypeRoundTrip/Inputs/testcases/structural_types.swift

@@ -22,7 +22,11 @@ public func test() {
   roundTripType((x: Int, Float, y: Int.Type).self)
   roundTripType(((@escaping () -> ()) -> ()).self)
   roundTripType(Array<@convention(c) () -> ()>.self)
+
+  // @convention(block) requires Objective-C support
+  #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
   roundTripType(Array<(@escaping @convention(block) () -> (), @convention(block) () -> ()) -> ()>.self)
+  #endif
 
   roundTripType(Int.Type.self)
   roundTripType(((inout String) -> ()).Type.self)
@@ -39,7 +43,11 @@ public func test() {
   roundTripType((x: Int, Float, y: Int.Type).Type.self)
   roundTripType(((@escaping () -> ()) -> ()).Type.self)
   roundTripType(Array<@convention(c) () -> ()>.Type.self)
+
+  // @convention(block) requires Objective-C support
+  #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
   roundTripType(Array<(@escaping @convention(block) () -> (), @convention(block) () -> ()) -> ()>.Type.self)
+  #endif
 
   // rdar://81587763: [SR-15025]: Function type syntax doesn't accept variadics
   // or __owned