Merge pull request #84359 from DougGregor/diagnose-untyped-throws-in-embedded

Author: DougGregor

lib/Frontend/CompilerInvocation.cpp

@@ -2525,6 +2525,21 @@ static bool ParseSearchPathArgs(SearchPathOptions &Opts, ArgList &Args,
   return false;
 }
 
+/// Determine whether the given argument list enables Embedded Swift.
+static bool isEmbedded(ArgList &args) {
+  using namespace swift::options;
+
+  for (const Arg *arg : args.filtered_reverse(
+           OPT_enable_experimental_feature, OPT_disable_experimental_feature)) {
+    if (llvm::StringRef(arg->getValue()) != "Embedded")
+      continue;
+
+    return arg->getOption().matches(OPT_enable_experimental_feature);
+  }
+
+  return false;
+}
+
 static bool ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,
                                 DiagnosticEngine &Diags) {
   // NOTE: This executes at the beginning of parsing the command line and cannot
@@ -2592,6 +2607,14 @@ static bool ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,
     }
   }
 
+  // If the "embedded" flag was provided, enable the EmbeddedRestrictions
+  // warning group. This group is opt-in in non-Embedded builds.
+  if (isEmbedded(Args)) {
+    Opts.WarningsAsErrorsRules.push_back(
+        WarningAsErrorRule(WarningAsErrorRule::Action::Disable,
+                           "EmbeddedRestrictions"));
+  }
+
   Opts.SuppressWarnings |= Args.hasArg(OPT_suppress_warnings);
   Opts.SuppressRemarks |= Args.hasArg(OPT_suppress_remarks);
   for (const Arg *arg : Args.filtered(OPT_warning_treating_Group)) {

stdlib/public/core/Array.swift

@@ -1509,6 +1509,7 @@ extension Array {
 }
 
 extension Array {
+#if !$Embedded
   /// Implementation preserved (for ABI reasons) for:
   /// Array(unsafeUninitializedCapacity:initializingWith:)
   /// and ContiguousArray(unsafeUninitializedCapacity:initializingWith:)
@@ -1525,6 +1526,7 @@ extension Array {
       initializingWithTypedThrowsInitializer: initializer
     )
   }
+#endif
 
   /// Implementation for:
   /// Array(unsafeUninitializedCapacity:initializingWith:)

stdlib/public/core/ArrayBufferProtocol.swift

@@ -76,11 +76,13 @@ where Indices == Range<Int> {
   /// Returns a `_SliceBuffer` containing the elements in `bounds`.
   subscript(bounds: Range<Int>) -> _SliceBuffer<Element> { get }
 
+#if !$Embedded
   // Superseded by the typed-throws version of this function, but retained
   // for ABI reasons.
   func withUnsafeBufferPointer<R>(
     _ body: (UnsafeBufferPointer<Element>) throws -> R
   ) rethrows -> R
+#endif
 
   /// Call `body(p)`, where `p` is an `UnsafeBufferPointer` over the
   /// underlying contiguous storage.  If no such storage exists, it is
@@ -90,11 +92,13 @@ where Indices == Range<Int> {
     _ body: (UnsafeBufferPointer<Element>) throws(E) -> R
   ) throws(E) -> R
 
+#if !$Embedded
   // Superseded by the typed-throws version of this function, but retained
   // for ABI reasons.
   mutating func withUnsafeMutableBufferPointer<R>(
     _ body: (UnsafeMutableBufferPointer<Element>) throws -> R
   ) rethrows -> R
+#endif
 
   /// Call `body(p)`, where `p` is an `UnsafeMutableBufferPointer`
   /// over the underlying contiguous storage.

stdlib/public/core/Collection.swift

@@ -1213,6 +1213,7 @@ extension Collection {
     return Array(result)
   }
 
+#if !$Embedded
   // ABI-only entrypoint for the rethrows version of map, which has been
   // superseded by the typed-throws version. Expressed as "throws", which is
   // ABI-compatible with "rethrows".
@@ -1224,6 +1225,7 @@ extension Collection {
   ) throws -> [T] {
     try map(transform)
   }
+#endif
 
   /// Returns a subsequence containing all but the given number of initial
   /// elements.

stdlib/public/core/ExistentialCollection.swift

@@ -1334,6 +1334,7 @@ extension AnySequence {
     }
   }
 
+#if !$Embedded
   // ABI-only entrypoint for the rethrows version of map, which has been
   // superseded by the typed-throws version. Expressed as "throws", which is
   // ABI-compatible with "rethrows".
@@ -1345,6 +1346,7 @@ extension AnySequence {
   ) throws -> [T] {
     try map(transform)
   }
+#endif
 
   @inlinable
   public __consuming func filter(
@@ -1438,6 +1440,7 @@ extension AnyCollection {
     }
   }
 
+#if !$Embedded
   // ABI-only entrypoint for the rethrows version of map, which has been
   // superseded by the typed-throws version. Expressed as "throws", which is
   // ABI-compatible with "rethrows".
@@ -1449,6 +1452,7 @@ extension AnyCollection {
   ) throws -> [T] {
     try map(transform)
   }
+#endif
 
   @inlinable
   public __consuming func filter(
@@ -1548,6 +1552,7 @@ extension AnyBidirectionalCollection {
     }
   }
 
+#if !$Embedded
   // ABI-only entrypoint for the rethrows version of map, which has been
   // superseded by the typed-throws version. Expressed as "throws", which is
   // ABI-compatible with "rethrows".
@@ -1559,6 +1564,7 @@ extension AnyBidirectionalCollection {
   ) throws -> [T] {
     try map(transform)
   }
+#endif
 
   @inlinable
   public __consuming func filter(
@@ -1660,6 +1666,7 @@ extension AnyRandomAccessCollection {
     }
   }
 
+#if !$Embedded
   // ABI-only entrypoint for the rethrows version of map, which has been
   // superseded by the typed-throws version. Expressed as "throws", which is
   // ABI-compatible with "rethrows".
@@ -1671,6 +1678,7 @@ extension AnyRandomAccessCollection {
   ) throws -> [T] {
     try map(transform)
   }
+#endif
 
   @inlinable
   public __consuming func filter(

stdlib/public/core/LifetimeManager.swift

@@ -184,6 +184,7 @@ public func withUnsafePointer<T: ~Copyable, E: Error, Result: ~Copyable>(
   return try unsafe body(UnsafePointer<T>(Builtin.addressOfBorrow(value)))
 }
 
+#if !$Embedded
 /// ABI: Historical withUnsafePointer(to:_:) rethrows, expressed as "throws",
 /// which is ABI-compatible with "rethrows".
 @_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
@@ -196,6 +197,7 @@ internal func __abi_withUnsafePointer<T, Result>(
 {
   return try unsafe body(UnsafePointer<T>(Builtin.addressOfBorrow(value)))
 }
+#endif
 
 /// Invokes the given closure with a pointer to the given argument.
 ///
@@ -229,6 +231,7 @@ public func withUnsafePointer<T: ~Copyable, E: Error, Result: ~Copyable>(
   try unsafe body(UnsafePointer<T>(Builtin.addressof(&value)))
 }
 
+#if !$Embedded
 /// ABI: Historical withUnsafePointer(to:_:) rethrows,
 /// expressed as "throws", which is ABI-compatible with "rethrows".
 @_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
@@ -240,6 +243,7 @@ internal func __abi_se0413_withUnsafePointer<T, Result>(
 ) throws -> Result {
   return try unsafe body(UnsafePointer<T>(Builtin.addressof(&value)))
 }
+#endif
 
 /// Invokes the given closure with a pointer to the given argument.
 ///

stdlib/public/core/Sequence.swift

@@ -705,6 +705,7 @@ extension Sequence {
     return Array(result)
   }
 
+#if !$Embedded
   // ABI-only entrypoint for the rethrows version of map, which has been
   // superseded by the typed-throws version. Expressed as "throws", which is
   // ABI-compatible with "rethrows".
@@ -716,6 +717,7 @@ extension Sequence {
   ) throws -> [T] {
     try map(transform)
   }
+#endif
 
   /// Returns an array containing, in order, the elements of the sequence
   /// that satisfy the given predicate.

stdlib/public/core/UnsafeRawBufferPointer.swift.gyb

@@ -1278,6 +1278,7 @@ public func withUnsafeMutableBytes<T: ~Copyable, E: Error, Result: ~Copyable>(
   return try unsafe body(unsafe .init(start: pointer, count: MemoryLayout<T>.size))
 }
 
+#if !$Embedded
 /// ABI: Historical withUnsafeMutableBytes(of:_:) rethrows,
 /// expressed as "throws", which is ABI-compatible with "rethrows".
 @_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
@@ -1292,6 +1293,7 @@ func __abi_se0413_withUnsafeMutableBytes<T, Result>(
         start: $0, count: MemoryLayout<T>.size))
   }
 }
+#endif
 
 /// Invokes the given closure with a buffer pointer covering the raw bytes of
 /// the given argument.
@@ -1345,6 +1347,7 @@ public func withUnsafeBytes<T: ~Copyable, E: Error, Result: ~Copyable>(
   return try unsafe body(unsafe .init(start: address, count: MemoryLayout<T>.size))
 }
 
+#if !$Embedded
 /// ABI: Historical withUnsafeBytes(of:_:) rethrows,
 /// expressed as "throws", which is ABI-compatible with "rethrows".
 @_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
@@ -1358,6 +1361,7 @@ func __abi_se0413_withUnsafeBytes<T, Result>(
     try unsafe body(unsafe UnsafeRawBufferPointer(start: $0, count: MemoryLayout<T>.size))
   }
 }
+#endif
 
 /// Invokes the given closure with a buffer pointer covering the raw bytes of
 /// the given argument.
@@ -1409,6 +1413,7 @@ public func withUnsafeBytes<
   return try unsafe body(unsafe .init(start: addr, count: MemoryLayout<T>.size))
 }
 
+#if !$Embedded
 /// ABI: Historical withUnsafeBytes(of:_:) rethrows,
 /// expressed as "throws", which is ABI-compatible with "rethrows".
 @_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
@@ -1422,6 +1427,7 @@ func __abi_se0413_withUnsafeBytes<T, Result>(
   let buffer = unsafe UnsafeRawBufferPointer(start: addr, count: MemoryLayout<T>.size)
   return try unsafe body(buffer)
 }
+#endif
 
 /// Invokes the given closure with a buffer pointer covering the raw bytes of
 /// the given argument.

test/embedded/restrictions.swift

@@ -1,5 +1,5 @@
 // RUN: %target-typecheck-verify-swift -Wwarning EmbeddedRestrictions -verify-additional-prefix nonembedded-
-// RUN: %target-typecheck-verify-swift -Wwarning EmbeddedRestrictions -enable-experimental-feature Embedded -verify-additional-prefix embedded-
+// RUN: %target-typecheck-verify-swift -enable-experimental-feature Embedded -verify-additional-prefix embedded-
 
 // REQUIRES: swift_in_compiler
 // REQUIRES: swift_feature_Embedded