Merge pull request #41871 from xedin/fix-mark-protocol-issues-related-to-distributd

ktoso · web-flow · commit 14fb9a03ff52 · 2022-03-18T21:08:04.000+09:00
[Distributed] Strip marker protocols from distributed thunks and accessible functions
diff --git a/include/swift/AST/ASTMangler.h b/include/swift/AST/ASTMangler.h
@@ -186,6 +186,8 @@ class ASTMangler : public Mangler {
                                              Type GlobalActorBound,
                                              ModuleDecl *Module);
 
+  std::string mangleDistributedThunk(const FuncDecl *thunk);
+
   /// Mangle a completion handler block implementation function, used for importing ObjC
   /// APIs as async.
   ///
diff --git a/include/swift/AST/GenericSignature.h b/include/swift/AST/GenericSignature.h
@@ -122,6 +122,10 @@ class GenericSignature {
                               ArrayRef<Requirement> requirements,
                               bool isKnownCanonical = false);
 
+  /// Produce a new generic signature which drops all of the marker
+  /// protocol conformance requirements associated with this one.
+  GenericSignature withoutMarkerProtocols() const;
+
 public:
   static ASTContext &getASTContext(TypeArrayView<GenericTypeParamType> params,
                                    ArrayRef<Requirement> requirements);
diff --git a/lib/AST/ASTMangler.cpp b/lib/AST/ASTMangler.cpp
@@ -3457,3 +3457,11 @@ ASTMangler::mangleOpaqueTypeDescriptorRecord(const OpaqueTypeDecl *decl) {
   appendOperator("Ho");
   return finalize();
 }
+
+std::string ASTMangler::mangleDistributedThunk(const FuncDecl *thunk) {
+  // Marker protocols cannot be checked at runtime, so there is no point
+  // in recording them for distributed thunks.
+  llvm::SaveAndRestore<bool> savedAllowMarkerProtocols(AllowMarkerProtocols,
+                                                       false);
+  return mangleEntity(thunk, SymbolKind::DistributedThunk);
+}
diff --git a/lib/AST/GenericSignature.cpp b/lib/AST/GenericSignature.cpp
@@ -1163,3 +1163,24 @@ swift::buildGenericSignature(ASTContext &ctx,
         addedRequirements},
       GenericSignatureWithError()).getPointer();
 }
+
+GenericSignature GenericSignature::withoutMarkerProtocols() const {
+  auto requirements = getRequirements();
+  SmallVector<Requirement, 4> reducedRequirements;
+
+  // Drop all conformance requirements to marker protocols (if any).
+  llvm::copy_if(requirements, std::back_inserter(reducedRequirements),
+                [](const Requirement &requirement) {
+                  if (requirement.getKind() == RequirementKind::Conformance) {
+                    auto *protocol = requirement.getProtocolDecl();
+                    return !protocol->isMarkerProtocol();
+                  }
+                  return true;
+                });
+
+  // If nothing changed, let's return this signature back.
+  if (requirements.size() == reducedRequirements.size())
+    return *this;
+
+  return GenericSignature::get(getGenericParams(), reducedRequirements);
+}
diff --git a/lib/IRGen/GenDecl.cpp b/lib/IRGen/GenDecl.cpp
@@ -4172,7 +4172,10 @@ void IRGenModule::emitAccessibleFunctions() {
 
     GenericSignature signature;
     if (auto *env = func->getGenericEnvironment()) {
-      signature = env->getGenericSignature();
+      // Drop all of the marker protocols because they are effect-less
+      // at runtime.
+      signature = env->getGenericSignature().withoutMarkerProtocols();
+
       genericEnvironment =
           getAddrOfGenericEnvironment(signature.getCanonicalSignature());
     }
diff --git a/lib/SIL/IR/SILDeclRef.cpp b/lib/SIL/IR/SILDeclRef.cpp
@@ -914,6 +914,10 @@ std::string SILDeclRef::mangle(ManglingKind MKind) const {
         return CDeclA->Name.str();
       }
 
+    if (SKind == ASTMangler::SymbolKind::DistributedThunk) {
+      return mangler.mangleDistributedThunk(cast<FuncDecl>(getDecl()));
+    }
+
     // Otherwise, fall through into the 'other decl' case.
     LLVM_FALLTHROUGH;
 
diff --git a/lib/Sema/CodeSynthesisDistributedActor.cpp b/lib/Sema/CodeSynthesisDistributedActor.cpp
@@ -429,11 +429,10 @@ deriveBodyDistributed_thunk(AbstractFunctionDecl *thunk, void *context) {
   {
     // --- Mangle the thunk name
     Mangle::ASTMangler mangler;
-    auto symbolKind = swift::Mangle::ASTMangler::SymbolKind::DistributedThunk;
-    auto mangled = C.AllocateCopy(mangler.mangleEntity(thunk, symbolKind));
-    StringRef mangledTargetStringRef = StringRef(mangled);
-    auto mangledTargetStringLiteral = new (C)
-        StringLiteralExpr(mangledTargetStringRef, SourceRange(), implicit);
+    auto mangled =
+        C.AllocateCopy(mangler.mangleDistributedThunk(cast<FuncDecl>(thunk)));
+    auto mangledTargetStringLiteral =
+        new (C) StringLiteralExpr(mangled, SourceRange(), implicit);
 
     // --- let target = RemoteCallTarget(<mangled name>)
     targetVar->setInterfaceType(remoteCallTargetTy);
diff --git a/test/Distributed/Runtime/distributed_actor_remoteCallTarget_demanglingTargetNames.swift b/test/Distributed/Runtime/distributed_actor_remoteCallTarget_demanglingTargetNames.swift
@@ -19,6 +19,9 @@ import FakeDistributedActorSystems
 
 typealias DefaultDistributedActorSystem = FakeRoundtripActorSystem
 
+protocol SomeProtocol {}
+extension String: SomeProtocol {}
+
 distributed actor Greeter {
   distributed func noParams() {}
   distributed func noParamsThrows() throws {}
@@ -28,9 +31,9 @@ distributed actor Greeter {
   distributed func oneLabel(value: String, _ value2: String, _ value3: String) {}
   distributed func parameterSingle(first: String) {}
   distributed func parameterPair(first: String, second: Int) {}
-  // FIXME(distributed): rdar://90293494 fails to get
-//  distributed func generic<A: Codable & Sendable>(first: A) {}
-//  distributed func genericNoLabel<A: Codable & Sendable>(_ first: A) {}
+  distributed func generic<A: Codable & Sendable>(first: A) {}
+  distributed func genericThree<A: Codable & Sendable & SomeProtocol>(first: A) {}
+  distributed func genericThreeTwo<A: Codable & Sendable, B: Codable & SomeProtocol>(first: A, second: B) {}
 }
 extension Greeter {
   distributed func parameterTriple(first: String, second: Int, third: Double) {}
@@ -65,16 +68,25 @@ func test() async throws {
   _ = try await greeter.parameterTriple(first: "X", second: 2, third: 3.0)
   // CHECK: >> remoteCallVoid: on:main.Greeter, target:main.Greeter.parameterTriple(first:second:third:)
 
-  // FIXME: rdar://90293494 seems to fail getting the substitutions?
-//  _ = try await greeter.generic(first: "X")
-//  // TODO: >> remoteCallVoid: on:main.Greeter, target:main.Greeter.parameterTriple(first:second:third:)
+  _ = try await greeter.generic(first: "X")
+  // CHECK: >> remoteCallVoid: on:main.Greeter, target:main.Greeter.generic(first:)
+
+  _ = try await greeter.genericThree(first: "X")
+  // CHECK: >> remoteCallVoid: on:main.Greeter, target:main.Greeter.genericThree(first:)
+
+  _ = try await greeter.genericThreeTwo(first: "X", second: "SecondValue")
+  // CHECK: >> remoteCallVoid: on:main.Greeter, target:main.Greeter.genericThreeTwo(first:second:)
 
   print("done")
   // CHECK: done
 }
 
 @main struct Main {
   static func main() async {
-    try! await test()
+    do {
+      try await test()
+    } catch {
+      print("ERROR: \(error)")
+    }
   }
 }
diff --git a/test/Distributed/distributed_actor_accessor_section_coff.swift b/test/Distributed/distributed_actor_accessor_section_coff.swift
@@ -76,6 +76,10 @@ public distributed actor MyActor {
   distributed func complex(_: [Int], _: Obj, _: String?, _: LargeStruct) -> LargeStruct {
     fatalError()
   }
+
+  // Make sure that Sendable doesn't show up in the mangled name
+  distributed func generic<T: Codable & Sendable>(_: T) {
+  }
 }
 
 @available(SwiftStdlib 5.7, *)
@@ -123,6 +127,12 @@ public distributed actor MyOtherActor {
 // CHECK-SAME: (%swift.async_func_pointer* @"$s27distributed_actor_accessors7MyActorC7complexyAA11LargeStructVSaySiG_AA3ObjCSSSgAFtYaKFTETFTu" to i{{32|64}})
 // CHECK-SAME: , section ".sw5acfn$B", {{.*}}
 
+/// -> `MyActor.generic`
+// CHECK:      @"$s27distributed_actor_accessors7MyActorC7genericyyxYaKSeRzSERzlFTEHF" = private constant
+// CHECK-SAME: @"symbolic x___________pSeRzSERzlIetMHngzo_ 27distributed_actor_accessors7MyActorC s5ErrorP"
+// CHECK-SAME: (%swift.async_func_pointer* @"$s27distributed_actor_accessors7MyActorC7genericyyxYaKSeRzSERzlFTETFTu" to i{{32|64}})
+// CHECK-SAME: , section ".sw5acfn$B", {{.*}}
+
 /// -> `MyOtherActor.empty`
 // CHECK:      @"$s27distributed_actor_accessors12MyOtherActorC5emptyyyYaKFTEHF" = private constant
 // CHECK-SAME: @"symbolic ___________pIetMHgzo_ 27distributed_actor_accessors12MyOtherActorC s5ErrorP"
diff --git a/test/Distributed/distributed_actor_accessor_section_elf.swift b/test/Distributed/distributed_actor_accessor_section_elf.swift
@@ -74,6 +74,10 @@ public distributed actor MyActor {
   distributed func complex(_: [Int], _: Obj, _: String?, _: LargeStruct) -> LargeStruct {
     fatalError()
   }
+
+  // Make sure that Sendable doesn't show up in the mangled name
+  distributed func generic<T: Codable & Sendable>(_: T) {
+  }
 }
 
 @available(SwiftStdlib 5.7, *)
@@ -121,6 +125,12 @@ public distributed actor MyOtherActor {
 // CHECK-SAME: (%swift.async_func_pointer* @"$s27distributed_actor_accessors7MyActorC7complexyAA11LargeStructVSaySiG_AA3ObjCSSSgAFtYaKFTETFTu" to i{{32|64}})
 // CHECK-SAME: , section "swift5_accessible_functions", {{.*}}
 
+/// -> `MyActor.generic`
+// CHECK:      @"$s27distributed_actor_accessors7MyActorC7genericyyxYaKSeRzSERzlFTEHF" = private constant
+// CHECK-SAME: @"symbolic x___________pSeRzSERzlIetMHngzo_ 27distributed_actor_accessors7MyActorC s5ErrorP"
+// CHECK-SAME: (%swift.async_func_pointer* @"$s27distributed_actor_accessors7MyActorC7genericyyxYaKSeRzSERzlFTETFTu" to i{{32|64}})
+// CHECK-SAME: , section "swift5_accessible_functions", {{.*}}
+
 /// -> `MyOtherActor.empty`
 // CHECK:      @"$s27distributed_actor_accessors12MyOtherActorC5emptyyyYaKFTEHF" = private constant
 // CHECK-SAME: @"symbolic ___________pIetMHgzo_ 27distributed_actor_accessors12MyOtherActorC s5ErrorP"
diff --git a/test/Distributed/distributed_actor_accessor_section_macho.swift b/test/Distributed/distributed_actor_accessor_section_macho.swift
@@ -74,6 +74,10 @@ public distributed actor MyActor {
   distributed func complex(_: [Int], _: Obj, _: String?, _: LargeStruct) -> LargeStruct {
     fatalError()
   }
+
+  // Make sure that Sendable doesn't show up in the mangled name
+  distributed func generic<T: Codable & Sendable>(_: T) {
+  }
 }
 
 @available(SwiftStdlib 5.7, *)
@@ -121,6 +125,12 @@ public distributed actor MyOtherActor {
 // CHECK-SAME: (%swift.async_func_pointer* @"$s27distributed_actor_accessors7MyActorC7complexyAA11LargeStructVSaySiG_AA3ObjCSSSgAFtYaKFTETFTu" to i{{32|64}})
 // CHECK-SAME: , section {{"swift5_accessible_functions"|".sw5acfn$B"|"__TEXT, __swift5_acfuncs, regular"}}
 
+/// -> `MyActor.generic`
+// CHECK:      @"$s27distributed_actor_accessors7MyActorC7genericyyxYaKSeRzSERzlFTEHF" = private constant
+// CHECK-SAME: @"symbolic x___________pSeRzSERzlIetMHngzo_ 27distributed_actor_accessors7MyActorC s5ErrorP"
+// CHECK-SAME: (%swift.async_func_pointer* @"$s27distributed_actor_accessors7MyActorC7genericyyxYaKSeRzSERzlFTETFTu" to i{{32|64}})
+// CHECK-SAME: , section {{"swift5_accessible_functions"|".sw5acfn$B"|"__TEXT, __swift5_acfuncs, regular"}}
+
 /// -> `MyOtherActor.empty`
 // CHECK:      @"$s27distributed_actor_accessors12MyOtherActorC5emptyyyYaKFTEHF" = private constant
 // CHECK-SAME: @"symbolic ___________pIetMHgzo_ 27distributed_actor_accessors12MyOtherActorC s5ErrorP"

Original file line number	Diff line number	Diff line change
`@@ -914,6 +914,10 @@ std::string SILDeclRef::mangle(ManglingKind MKind) const {`
`914`	`914`	`return CDeclA->Name.str();`
`915`	`915`	`}`
`916`	`916`
	`917`	`+ if (SKind == ASTMangler::SymbolKind::DistributedThunk) {`
	`918`	`+ return mangler.mangleDistributedThunk(cast<FuncDecl>(getDecl()));`
	`919`	`+ }`
	`920`	`+`
`917`	`921`	`// Otherwise, fall through into the 'other decl' case.`
`918`	`922`	`LLVM_FALLTHROUGH;`
`919`	`923`