Merge pull request #84748 from Azoy/62-deserialization-issue

[6.2] [Serialization] Serialize isAddressable on param decls

Author: Azoy

lib/Serialization/Deserialization.cpp

@@ -4118,6 +4118,7 @@ class DeclDeserializer {
     bool isCompileTimeLiteral, isConstValue;
     bool isSending;
     bool isCallerIsolated;
+    bool isAddressable;
     uint8_t rawDefaultArg;
     TypeID defaultExprType;
     uint8_t rawDefaultArgIsolation;
@@ -4131,6 +4132,7 @@ class DeclDeserializer {
                                          isConstValue,
                                          isSending,
                                          isCallerIsolated,
+                                         isAddressable,
                                          rawDefaultArg,
                                          defaultExprType,
                                          rawDefaultArgIsolation,
@@ -4177,6 +4179,7 @@ class DeclDeserializer {
     param->setConstValue(isConstValue);
     param->setSending(isSending);
     param->setCallerIsolated(isCallerIsolated);
+    param->setAddressable(isAddressable);
 
     // Decode the default argument kind.
     // FIXME: Default argument expression, if available.

lib/Serialization/ModuleFormat.h

@@ -58,7 +58,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 948; // @_expose kind
+const uint16_t SWIFTMODULE_VERSION_MINOR = 949; // serialize param decl isAddressable
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
@@ -1730,6 +1730,7 @@ namespace decls_block {
     BCFixed<1>,              // isConst?
     BCFixed<1>,              // isSending?
     BCFixed<1>,              // isCallerIsolated?
+    BCFixed<1>,              // isAddressable?
     DefaultArgumentField,    // default argument kind
     TypeIDField,             // default argument type
     ActorIsolationField,     // default argument isolation

lib/Serialization/Serialization.cpp

@@ -4764,6 +4764,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
         param->isConstVal(),
         param->isSending(),
         param->isCallerIsolated(),
+        param->isAddressable(),
         getRawStableDefaultArgumentKind(argKind),
         S.addTypeRef(defaultExprType),
         getRawStableActorIsolationKind(isolation.getKind()),

test/Serialization/Inputs/lifetime_dependence.swift

@@ -0,0 +1,23 @@
+import Builtin
+
+@frozen
+@safe
+public struct Ref<T: ~Copyable>: Copyable, ~Escapable {
+  @usableFromInline
+  let _pointer: UnsafePointer<T>
+
+  @_lifetime(borrow value)
+  @_alwaysEmitIntoClient
+  @_transparent
+  public init(_ value: borrowing @_addressable T) {
+    unsafe _pointer = UnsafePointer(Builtin.unprotectedAddressOfBorrow(value))
+  }
+
+  @_alwaysEmitIntoClient
+  public subscript() -> T {
+    @_transparent
+    unsafeAddress {
+      unsafe _pointer
+    }
+  }
+}

test/Serialization/lifetime_dependence.swift

@@ -0,0 +1,17 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -enable-builtin-module -enable-experimental-feature Lifetimes -enable-experimental-feature AddressableTypes -enable-experimental-feature AddressableParameters -module-name lifetime_dependence_ref -o %t %S/Inputs/lifetime_dependence.swift
+// RUN: %target-swift-frontend -I %t -emit-ir %s -verify | %FileCheck %s
+
+// REQUIRES: swift_feature_Lifetimes
+// REQUIRES: swift_feature_AddressableTypes
+// REQUIRES: swift_feature_AddressableParameters
+
+import lifetime_dependence_ref
+
+public func foo() {
+  let x = 123
+  let y = Ref(x)
+
+  // CHECK: print
+  print(y[])
+}