Merge pull request #2967 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

CHANGELOG.md

@@ -8429,6 +8429,7 @@ Swift 1.0
 [SE-0284]: <https://github.com/apple/swift-evolution/blob/main/proposals/0284-multiple-variadic-parameters.md>
 [SE-0286]: <https://github.com/apple/swift-evolution/blob/main/proposals/0286-forward-scan-trailing-closures.md>
 [SE-0287]: <https://github.com/apple/swift-evolution/blob/main/proposals/0287-implicit-member-chains.md>
+[SE-0293]: <https://github.com/apple/swift-evolution/blob/main/proposals/0293-extend-property-wrappers-to-function-and-closure-parameters.md>
 [SE-0296]: <https://github.com/apple/swift-evolution/blob/main/proposals/0296-async-await.md>
 [SE-0297]: <https://github.com/apple/swift-evolution/blob/main/proposals/0297-concurrency-objc.md>
 [SE-0298]: <https://github.com/apple/swift-evolution/blob/main/proposals/0298-asyncsequence.md>

include/swift/ABI/Metadata.h

@@ -1035,7 +1035,9 @@ struct TargetAnyClassMetadata : public TargetHeapMetadata<Runtime> {
   // Note that ObjC classes do not have a metadata header.
 
   /// The metadata for the superclass.  This is null for the root class.
-  ConstTargetMetadataPointer<Runtime, swift::TargetClassMetadata> Superclass;
+  TargetSignedPointer<Runtime, const TargetClassMetadata<Runtime> *
+                                   __ptrauth_swift_objc_superclass>
+      Superclass;
 
 #if SWIFT_OBJC_INTEROP
   /// The cache data is used for certain dynamic lookups; it is owned

include/swift/ABI/MetadataValues.h

@@ -1209,6 +1209,10 @@ namespace SpecialPointerAuthDiscriminators {
   const uint16_t OpaqueReadResumeFunction = 56769;
   const uint16_t OpaqueModifyResumeFunction = 3909;
 
+  /// ObjC class pointers.
+  const uint16_t ObjCISA = 0x6AE1;
+  const uint16_t ObjCSuperclass = 0xB5AB;
+
   /// Resilient class stub initializer callback
   const uint16_t ResilientClassStubInitCallback = 0xC671;
 

include/swift/Parse/Token.h

@@ -130,8 +130,8 @@ class Token {
   }
 
   bool isContextualKeyword(StringRef ContextKW) const {
-    return is(tok::identifier) && !isEscapedIdentifier() &&
-           Text == ContextKW;
+    return isAny(tok::identifier, tok::contextual_keyword) &&
+           !isEscapedIdentifier() && Text == ContextKW;
   }
 
   /// Return true if this is a contextual keyword that could be the start of a

include/swift/Remote/MetadataReader.h

@@ -500,7 +500,7 @@ class MetadataReader {
       return StoredPointer();
 
     auto classMeta = cast<TargetClassMetadata<Runtime>>(meta);
-    return classMeta->Superclass;
+    return stripSignedPointer(classMeta->Superclass);
   }
 
   /// Given a remote pointer to class metadata, attempt to discover its class
@@ -534,9 +534,9 @@ class MetadataReader {
     size_t start = isaAndRetainCountSize;
 
     auto classMeta = cast<TargetClassMetadata<Runtime>>(meta);
-    while (classMeta->Superclass) {
+    while (stripSignedPointer(classMeta->Superclass)) {
       classMeta = cast<TargetClassMetadata<Runtime>>(
-          readMetadata(classMeta->Superclass));
+          readMetadata(stripSignedPointer(classMeta->Superclass)));
 
       // Subtract the size contribution of the isa and retain counts from 
       // the super class.
@@ -1751,7 +1751,8 @@ class MetadataReader {
         if (descriptorAddress || !skipArtificialSubclasses)
           return static_cast<StoredPointer>(descriptorAddress);
 
-        auto superclassMetadataAddress = classMeta->Superclass;
+        auto superclassMetadataAddress =
+            stripSignedPointer(classMeta->Superclass);
         if (!superclassMetadataAddress)
           return 0;
 
@@ -2661,11 +2662,11 @@ class MetadataReader {
     BuiltType BuiltObjCClass = Builder.createObjCClassType(std::move(className));
     if (!BuiltObjCClass) {
       // Try the superclass.
-      if (!classMeta->Superclass)
+      if (!stripSignedPointer(classMeta->Superclass))
         return BuiltType();
 
-      BuiltObjCClass = readTypeFromMetadata(classMeta->Superclass,
-                                            skipArtificialSubclasses);
+      BuiltObjCClass = readTypeFromMetadata(
+          stripSignedPointer(classMeta->Superclass), skipArtificialSubclasses);
     }
 
     TypeCache[origMetadataPtr] = BuiltObjCClass;

include/swift/Runtime/Config.h

@@ -250,6 +250,9 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
 #define __ptrauth_swift_dispatch_invoke_function                               \
   __ptrauth(ptrauth_key_process_independent_code, 1,                           \
             SpecialPointerAuthDiscriminators::DispatchInvokeFunction)
+#define __ptrauth_swift_objc_superclass                                        \
+  __ptrauth(ptrauth_key_process_independent_data, 1,                           \
+            swift::SpecialPointerAuthDiscriminators::ObjCSuperclass)
 #define swift_ptrauth_sign_opaque_read_resume_function(__fn, __buffer)         \
   ptrauth_auth_and_resign(__fn, ptrauth_key_function_pointer, 0,               \
                           ptrauth_key_process_independent_code,                \
@@ -276,6 +279,7 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
 #define __ptrauth_swift_cancellation_notification_function
 #define __ptrauth_swift_escalation_notification_function
 #define __ptrauth_swift_dispatch_invoke_function
+#define __ptrauth_swift_objc_superclass
 #define __ptrauth_swift_runtime_function_entry
 #define __ptrauth_swift_runtime_function_entry_with_key(__key)
 #define __ptrauth_swift_runtime_function_entry_strip(__fn) (__fn)

include/swift/SIL/MemAccessUtils.h

@@ -1372,7 +1372,7 @@ class AccessUseDefChainVisitor {
   Result visitGlobalAccess(SILValue global) {
     return asImpl().visitBase(global, AccessedStorage::Global);
   }
-  Result visitYieldAccess(BeginApplyResult *yield) {
+  Result visitYieldAccess(MultipleValueInstructionResult *yield) {
     return asImpl().visitBase(yield, AccessedStorage::Yield);
   }
   Result visitStackAccess(AllocStackInst *stack) {
@@ -1448,8 +1448,10 @@ Result AccessUseDefChainVisitor<Impl, Result>::visit(SILValue sourceAddr) {
 
   // A yield is effectively a nested access, enforced independently in
   // the caller and callee.
-  case ValueKind::BeginApplyResult:
-    return asImpl().visitYieldAccess(cast<BeginApplyResult>(sourceAddr));
+  case ValueKind::MultipleValueInstructionResult:
+    if (auto *baResult = isaResultOf<BeginApplyInst>(sourceAddr))
+      return asImpl().visitYieldAccess(baResult);
+    break;
 
   // A function argument is effectively a nested access, enforced
   // independently in the caller and callee.

include/swift/SIL/OwnershipUtils.h

@@ -894,8 +894,10 @@ class OwnedValueIntroducerKind {
       ;
     case ValueKind::ApplyInst:
       return Kind::Apply;
-    case ValueKind::BeginApplyResult:
-      return Kind::BeginApply;
+    case ValueKind::MultipleValueInstructionResult:
+      if (isaResultOf<BeginApplyInst>(value))
+        return Kind::BeginApply;
+      return Kind::Invalid;
     case ValueKind::StructInst:
       return Kind::Struct;
     case ValueKind::TupleInst:

include/swift/SIL/PatternMatch.h

@@ -411,9 +411,11 @@ template <typename LTy> struct tupleextractoperation_ty {
              L.match((ValueBase *)TEI->getOperand());
     }
 
-    if (auto *DTR = dyn_cast<DestructureTupleResult>(V)) {
-      return DTR->getIndex() == index &&
-             L.match((ValueBase *)DTR->getParent()->getOperand());
+    if (auto *DTR = dyn_cast<MultipleValueInstructionResult>(V)) {
+      if (auto *DT = dyn_cast<DestructureTupleInst>(DTR->getParent())) {
+        return DTR->getIndex() == index &&
+          L.match((ValueBase *)DT->getOperand());
+      }
     }
 
     return false;