Merge branch 'main' into observation_peer_macros

Author: natecook1000

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/StackPromotion.swift

@@ -289,14 +289,13 @@ private extension BasicBlockRange {
   /// Returns true if there is a direct edge connecting this range with the `otherRange`.
   func hasControlFlowEdge(to otherRange: BasicBlockRange) -> Bool {
     func isOnlyInOtherRange(_ block: BasicBlock) -> Bool {
-      return !inclusiveRangeContains(block) &&
-             otherRange.inclusiveRangeContains(block) && block != otherRange.begin
+      return !inclusiveRangeContains(block) && otherRange.inclusiveRangeContains(block)
     }
 
     for lifeBlock in inclusiveRange {
       assert(otherRange.inclusiveRangeContains(lifeBlock), "range must be a subset of other range")
       for succ in lifeBlock.successors {
-        if isOnlyInOtherRange(succ) {
+        if isOnlyInOtherRange(succ) && succ != otherRange.begin {
           return true
         }
         // The entry of the begin-block is conceptually not part of the range. We can check if

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifyInitEnumDataAddr.swift

@@ -18,6 +18,7 @@ extension InitEnumDataAddrInst : OnoneSimplifyable {
     // Optimize the sequence
     // ```
     //   %1 = init_enum_data_addr %enum_addr, #someCaseWithPayload
+    //   ...
     //   store %payload to %1
     //   inject_enum_addr %enum_addr, #someCaseWithPayload
     // ```
@@ -26,18 +27,16 @@ extension InitEnumDataAddrInst : OnoneSimplifyable {
     //   %1 = enum  $E, #someCaseWithPayload, %payload
     //   store %1 to %enum_addr
     // ```
-    // This sequence of three instructions must appear in consecutive order.
+    // This store and inject instructions must appear in consecutive order.
     // But usually this is the case, because it's generated this way by SILGen.
+    // We also check that between the init and the store, no instruction writes to memory.
     //
-    if let nextInst = self.next,
-       let store = nextInst as? StoreInst,
+    if let store = self.uses.singleUse?.instruction as? StoreInst,
        store.destination == self,
-       let singleUse = self.uses.singleUse,
-       singleUse.instruction == store,
-       let nextAfterStore = store.next,
-       let inject = nextAfterStore as? InjectEnumAddrInst,
+       let inject = store.next as? InjectEnumAddrInst,
        inject.enum == self.enum,
-       inject.enum.type.isLoadable(in: parentFunction) {
+       inject.enum.type.isLoadable(in: parentFunction),
+       !anyInstructionMayWriteToMemory(between: self, and: store) {
 
       assert(self.caseIndex == inject.caseIndex, "mismatching case indices when creating an enum")
 
@@ -51,3 +50,19 @@ extension InitEnumDataAddrInst : OnoneSimplifyable {
     }
   }
 }
+
+// Returns false if `first` and `last` are in the same basic block and no instructions between them write to memory. True otherwise.
+private func anyInstructionMayWriteToMemory(between first: Instruction, and last: Instruction) -> Bool {
+  var nextInstruction = first.next
+  while let i = nextInstruction {
+    if i == last {
+      return false
+    }
+    if i.mayWriteToMemory {
+      return true
+    }
+    nextInstruction = i.next
+  }
+  // End of basic block, and we did not find `last`
+  return true
+}

SwiftCompilerSources/Sources/SIL/GlobalVariable.swift

@@ -82,6 +82,8 @@ extension Instruction {
         return type.isBuiltinInteger || type.isBuiltinFloat
       case .PtrToInt:
         return bi.operands[0].value is StringLiteralInst
+      case .IntToPtr:
+        return bi.operands[0].value is IntegerLiteralInst
       case .StringObjectOr:
         // The first operand can be a string literal (i.e. a pointer), but the
         // second operand must be a constant. This enables creating a

include/swift-c/DependencyScan/DependencyScan.h

@@ -440,7 +440,7 @@ typedef enum {
   SWIFTSCAN_OUTPUT_TYPE_OBJECT = 0,
   SWIFTSCAN_OUTPUT_TYPE_SWIFTMODULE = 1,
   SWIFTSCAN_OUTPUT_TYPE_SWIFTINTERFACE = 2,
-  SWIFTSCAN_OUTPUT_TYPE_SWIFTPRIAVEINTERFACE = 3,
+  SWIFTSCAN_OUTPUT_TYPE_SWIFTPRIVATEINTERFACE = 3,
   SWIFTSCAN_OUTPUT_TYPE_CLANG_MODULE = 4,
   SWIFTSCAN_OUTPUT_TYPE_CLANG_PCH = 5
 } swiftscan_output_kind_t;

include/swift/AST/Attr.def.gyb

@@ -86,6 +86,7 @@ TYPE_ATTR(objc_metatype)
 TYPE_ATTR(opened)
 TYPE_ATTR(pack_element)
 TYPE_ATTR(pseudogeneric)
+TYPE_ATTR(unimplementable)
 TYPE_ATTR(yields)
 TYPE_ATTR(yield_once)
 TYPE_ATTR(yield_many)

include/swift/AST/CASTBridging.h

@@ -190,6 +190,7 @@ typedef enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedTypeAttrKind : long {
   BridgedTypeAttrKind_opened,
   BridgedTypeAttrKind_pack_element,
   BridgedTypeAttrKind_pseudogeneric,
+  BridgedTypeAttrKind_unimplementable,
   BridgedTypeAttrKind_yields,
   BridgedTypeAttrKind_yield_once,
   BridgedTypeAttrKind_yield_many,

include/swift/AST/DiagnosticsSIL.def

@@ -115,6 +115,12 @@ ERROR(c_function_pointer_from_function_with_context,none,
 ERROR(objc_selector_malformed,none,"the type ObjectiveC.Selector is malformed",
       ())
 
+ERROR(unsupported_variadic_function_abstraction,none,
+      "cannot fully abstract a value of variadic function type %0 because "
+      "different contexts will not be able to reliably agree on a calling "
+      "convention; try wrapping it in a struct",
+      (Type))
+
 // Capture before declaration diagnostics.
 ERROR(capture_before_declaration,none,
       "closure captures %0 before it is declared", (Identifier))
@@ -859,9 +865,13 @@ NOTE(sil_referencebinding_inout_binding_here, none,
 // Warnings arising from the flow-sensitive checking of Sendability of
 // non-Sendable values
 WARNING(consumed_value_used, none,
-        "Non-Sendable value consumed, then used at this site; could yield race with another thread", ())
+        "non-Sendable value consumed, then used at this site; could yield race with another thread", ())
 WARNING(arg_region_consumed, none,
-        "This application could pass `self` or a Non-Sendable argument of this function to another thread, potentially yielding a race with the caller", ())
+        "this application could pass `self` or a Non-Sendable argument of this function to another thread, potentially yielding a race with the caller", ())
+WARNING(consumption_yields_race, none,
+        "non-Sendable value sent across isolation domains here, but could be accessed later in this function (%0 access site%select{|s}1 displayed%select{|, %3 more hidden}2)", (unsigned, bool, bool, unsigned))
+NOTE(possible_racy_access_site, none,
+    "access here could race with non-Sendable value send above", ())
 
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

include/swift/AST/DiagnosticsSema.def

@@ -3370,7 +3370,8 @@ ERROR(decl_from_hidden_module,none,
       "it is an SPI imported from %3|"
       "it is SPI|"
       "%3 was imported for SPI only|"
-      "%3 was not imported by this file}4",
+      "%3 was not imported by this file|"
+      "C++ types from imported module %3 do not support library evolution}4",
       (DescriptiveDeclKind, DeclName, unsigned, Identifier, unsigned))
 WARNING(decl_from_hidden_module_warn,none,
       "cannot use %0 %1 %select{here|as property wrapper here|"
@@ -3391,7 +3392,8 @@ ERROR(typealias_desugars_to_type_from_hidden_module,none,
       "it is an SPI imported from %4|"
       "<<ERROR>>|"
       "%4 was imported for SPI only|"
-      "%4 was not imported by this file}5",
+      "%4 was not imported by this file|"
+      "C++ types from imported module %4 do not support library evolution}5",
       (DeclName, StringRef, StringRef, unsigned, Identifier, unsigned))
 ERROR(conformance_from_implementation_only_module,none,
       "cannot use conformance of %0 to %1 %select{here|as property wrapper here|"
@@ -3402,7 +3404,8 @@ ERROR(conformance_from_implementation_only_module,none,
       "the conformance is declared as SPI in %3|"
       "the conformance is declared as SPI|"
       "%3 was imported for SPI only|"
-      "%3 was not imported by this file}4",
+      "%3 was not imported by this file|"
+      "C++ types from imported module %3 do not support library evolution}4",
       (Type, Identifier, unsigned, Identifier, unsigned))
 NOTE(assoc_conformance_from_implementation_only_module,none,
      "in associated type %0 (inferred as %1)", (Type, Type))
@@ -6513,7 +6516,8 @@ ERROR(inlinable_decl_ref_from_hidden_module,
       "it is an SPI imported from %3|"
       "it is SPI|"
       "%3 was imported for SPI only|"
-      "%3 was not imported by this file}4",
+      "%3 was not imported by this file|"
+      "C++ APIs from imported module %3 do not support library evolution}4",
       (DescriptiveDeclKind, DeclName, unsigned, Identifier, unsigned))
 
 WARNING(inlinable_decl_ref_from_hidden_module_warn,
@@ -6529,7 +6533,8 @@ ERROR(inlinable_typealias_desugars_to_type_from_hidden_module,
       "it is an SPI imported from %4|"
       "<<ERROR>>|"
       "%4 was imported for SPI only|"
-      "%4 was not imported by this file}5",
+      "%4 was not imported by this file|"
+      "C++ types from imported module %4 do not support library evolution}5",
       (DeclName, StringRef, StringRef, unsigned, Identifier, unsigned))
 
 NOTE(missing_import_inserted,
@@ -7249,6 +7254,9 @@ ERROR(literal_type_in_macro_expansion,none,
 ERROR(invalid_macro_introduced_name,none,
       "declaration name %0 is not covered by macro %1",
       (DeclName, DeclName))
+ERROR(undocumented_conformance_in_expansion,none,
+      "conformance to %0 is not covered by macro %1",
+      (Type, DeclName))
 ERROR(invalid_macro_role_for_macro_syntax,none,
       "invalid macro role for %{a freestanding|an attached}0 macro",
       (unsigned))
@@ -7271,6 +7279,9 @@ ERROR(local_extension_macro,none,
 ERROR(extension_macro_invalid_conformance,none,
       "invalid protocol conformance %0 in extension macro",
       (Type))
+ERROR(macro_attached_to_invalid_decl,none,
+      "'%0' macro cannot be attached to %1",
+      (StringRef, DescriptiveDeclKind))
 
 ERROR(macro_resolve_circular_reference, none,
       "circular reference resolving %select{freestanding|attached}0 macro %1",

include/swift/AST/ExtInfo.h

@@ -651,8 +651,10 @@ class SILExtInfoBuilder {
   // If bits are added or removed, then TypeBase::SILFunctionTypeBits
   // and NumMaskBits must be updated, and they must match.
 
-  //   |representation|pseudogeneric| noescape | concurrent | async |differentiability|
-  //   |    0 .. 3    |      4      |     5    |     6      |   7   |     8 .. 10     |
+  //   |representation|pseudogeneric| noescape | concurrent | async
+  //   |    0 .. 3    |      4      |     5    |     6      |   7
+  //   |differentiability|unimplementable|
+  //   |     8 .. 10     |      11       |
   //
   enum : unsigned {
     RepresentationMask = 0xF << 0,
@@ -662,7 +664,8 @@ class SILExtInfoBuilder {
     AsyncMask = 1 << 7,
     DifferentiabilityMaskOffset = 8,
     DifferentiabilityMask = 0x7 << DifferentiabilityMaskOffset,
-    NumMaskBits = 11
+    UnimplementableMask = 1 << 11,
+    NumMaskBits = 12
   };
 
   unsigned bits; // Naturally sized for speed.
@@ -677,12 +680,13 @@ class SILExtInfoBuilder {
 
   static constexpr unsigned makeBits(Representation rep, bool isPseudogeneric,
                                      bool isNoEscape, bool isSendable,
-                                     bool isAsync,
+                                     bool isAsync, bool isUnimplementable,
                                      DifferentiabilityKind diffKind) {
     return ((unsigned)rep) | (isPseudogeneric ? PseudogenericMask : 0) |
            (isNoEscape ? NoEscapeMask : 0) |
            (isSendable ? SendableMask : 0) |
            (isAsync ? AsyncMask : 0) |
+           (isUnimplementable ? UnimplementableMask : 0) |
            (((unsigned)diffKind << DifferentiabilityMaskOffset) &
             DifferentiabilityMask);
   }
@@ -692,22 +696,23 @@ class SILExtInfoBuilder {
   /// non-pseudogeneric, non-differentiable.
   SILExtInfoBuilder()
       : SILExtInfoBuilder(makeBits(SILFunctionTypeRepresentation::Thick, false,
-                                   false, false, false,
+                                   false, false, false, false,
                                    DifferentiabilityKind::NonDifferentiable),
                           ClangTypeInfo(nullptr)) {}
 
   SILExtInfoBuilder(Representation rep, bool isPseudogeneric, bool isNoEscape,
-                    bool isSendable, bool isAsync,
+                    bool isSendable, bool isAsync, bool isUnimplementable,
                     DifferentiabilityKind diffKind, const clang::Type *type)
       : SILExtInfoBuilder(makeBits(rep, isPseudogeneric, isNoEscape,
-                                   isSendable, isAsync, diffKind),
+                                   isSendable, isAsync, isUnimplementable,
+                                   diffKind),
                           ClangTypeInfo(type)) {}
 
   // Constructor for polymorphic type.
   SILExtInfoBuilder(ASTExtInfoBuilder info, bool isPseudogeneric)
       : SILExtInfoBuilder(makeBits(info.getSILRepresentation(), isPseudogeneric,
                                    info.isNoEscape(), info.isSendable(),
-                                   info.isAsync(),
+                                   info.isAsync(), /*unimplementable*/ false,
                                    info.getDifferentiabilityKind()),
                           info.getClangTypeInfo()) {}
 
@@ -746,6 +751,10 @@ class SILExtInfoBuilder {
            DifferentiabilityKind::NonDifferentiable;
   }
 
+  constexpr bool isUnimplementable() const {
+    return bits & UnimplementableMask;
+  }
+
   /// Get the underlying ClangTypeInfo value.
   ClangTypeInfo getClangTypeInfo() const { return clangTypeInfo; }
 
@@ -816,6 +825,12 @@ class SILExtInfoBuilder {
                              clangTypeInfo);
   }
   [[nodiscard]]
+  SILExtInfoBuilder withUnimplementable(bool isUnimplementable = true) const {
+    return SILExtInfoBuilder(isUnimplementable ? (bits | UnimplementableMask)
+                                               : (bits & ~UnimplementableMask),
+                             clangTypeInfo);
+  }
+  [[nodiscard]]
   SILExtInfoBuilder
   withDifferentiabilityKind(DifferentiabilityKind differentiability) const {
     return SILExtInfoBuilder(
@@ -828,6 +843,7 @@ class SILExtInfoBuilder {
     return SILExtInfoBuilder(bits, ClangTypeInfo(type).getCanonical());
   }
 
+
   bool isEqualTo(SILExtInfoBuilder other, bool useClangTypes) const {
     return bits == other.bits &&
            (useClangTypes ? (clangTypeInfo == other.clangTypeInfo) : true);
@@ -873,7 +889,7 @@ class SILExtInfo {
   /// A default ExtInfo but with a Thin convention.
   static SILExtInfo getThin() {
     return SILExtInfoBuilder(SILExtInfoBuilder::Representation::Thin, false,
-                             false, false, false,
+                             false, false, false, false,
                              DifferentiabilityKind::NonDifferentiable, nullptr)
         .build();
   }
@@ -901,6 +917,10 @@ class SILExtInfo {
 
   constexpr bool isAsync() const { return builder.isAsync(); }
 
+  constexpr bool isUnimplementable() const {
+    return builder.isUnimplementable();
+  }
+
   constexpr DifferentiabilityKind getDifferentiabilityKind() const {
     return builder.getDifferentiabilityKind();
   }
@@ -935,6 +955,10 @@ class SILExtInfo {
     return builder.withAsync(isAsync).build();
   }
 
+  SILExtInfo withUnimplementable(bool isUnimplementable = true) const {
+    return builder.withUnimplementable(isUnimplementable).build();
+  }
+
   bool isEqualTo(SILExtInfo other, bool useClangTypes) const {
     return builder.isEqualTo(other.builder, useClangTypes);
   }

include/swift/AST/KnownIdentifiers.def

@@ -325,7 +325,6 @@ IDENTIFIER(size)
 IDENTIFIER(speed)
 IDENTIFIER(unchecked)
 IDENTIFIER(unsafe)
-IDENTIFIER(element)
 
 // The singleton instance of TupleTypeDecl in the Builtin module
 IDENTIFIER(TheTupleType)