Merge pull request #41349 from DougGregor/nonsendable-serialization-fix

Author: DougGregor

lib/Serialization/ModuleFormat.h

@@ -56,7 +56,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 = 667; // @_backDeploy
+const uint16_t SWIFTMODULE_VERSION_MINOR = 668; // @_nonSendable fix
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
@@ -1923,7 +1923,7 @@ namespace decls_block {
 
   using NonSendableDeclAttrLayout = BCRecordLayout<
     NonSendable_DECL_ATTR,
-    BCFixed<1>  // assumed flag
+    BCFixed<1>  // non-sendable kind
   >;
 
   using OptimizeDeclAttrLayout = BCRecordLayout<

lib/Serialization/Serialization.cpp

@@ -2504,7 +2504,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
       auto *theAttr = cast<NonSendableAttr>(DA);
       auto abbrCode = S.DeclTypeAbbrCodes[NonSendableDeclAttrLayout::Code];
       NonSendableDeclAttrLayout::emitRecord(S.Out, S.ScratchRecord, abbrCode,
-                                        (unsigned)theAttr->getKind());
+                                            (unsigned)theAttr->Specificity);
       return;
     }
 

test/Serialization/Inputs/def_nonsendable.swift

@@ -0,0 +1,5 @@
+@_nonSendable
+public struct A { }
+
+@_nonSendable(_assumed)
+public struct B { }

test/Serialization/nonsendable.swift

@@ -0,0 +1,16 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -module-name def_nonsendable -o %t %S/Inputs/def_nonsendable.swift
+// RUN: llvm-bcanalyzer %t/def_nonsendable.swiftmodule | %FileCheck %s
+// RUN: %target-swift-frontend -typecheck -I %t %s -o /dev/null
+// RUN: %target-swift-frontend -emit-sil -I %t %s -o /dev/null
+
+// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -module-to-print=def_nonsendable -I %t -source-filename=%s | %FileCheck -check-prefix=CHECK-PRINT %s
+
+// CHECK-NOT: UnknownCode
+
+// CHECK-PRINT-DAG: @_nonSendable struct A
+// CHECK-PRINT-DAG: @_nonSendable(_assumed) struct B
+
+import def_nonsendable
+
+func test(a: A, b: B) { }