averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Distributed] Don't drop dist get accessors from witness tables.

Browse Source 
This actually manifested as an pointer auth crash, but the real reason
being is that we messed up the order of elements in the witness table.
If we'd skip the accessor like this, the types we sign/auth with would
no longer align and manifest in a crash.

There is no real reason to skip this entry so we just bring it back, and
avoid making this special in any way.

This unlocks a few tests as well as corrects any distributed+protocol
use where a requirement distributed var was _followed by_ other
requirements.

resolves rdar://125628060
This commit is contained in:
Konrad 'ktoso' Malawski
2025-06-05 11:37:23 +09:00
parent 916e96d753
commit 362783c0f8
4 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/IRGen/GenMeta.cpp
View File

@@ -273,10 +273,11 @@ static Flags getMethodDescriptorFlags(ValueDecl *fn) {
return {Flags::Kind::ModifyCoroutine, false}; return {Flags::Kind::ModifyCoroutine, false};
case AccessorKind::Modify2: case AccessorKind::Modify2:
return {Flags::Kind::ModifyCoroutine, true}; return {Flags::Kind::ModifyCoroutine, true};
case AccessorKind::DistributedGet:
return {Flags::Kind::Getter, false};
#define OPAQUE_ACCESSOR(ID, KEYWORD) #define OPAQUE_ACCESSOR(ID, KEYWORD)
#define ACCESSOR(ID) \ #define ACCESSOR(ID) \
case AccessorKind::ID: case AccessorKind::ID:
case AccessorKind::DistributedGet:
#include "swift/AST/AccessorKinds.def" #include "swift/AST/AccessorKinds.def"
llvm_unreachable("these accessors never appear in protocols or v-tables"); llvm_unreachable("these accessors never appear in protocols or v-tables");
} }
@@ -1070,13 +1071,6 @@ namespace {
} }
for (auto &entry : pi.getWitnessEntries()) { for (auto &entry : pi.getWitnessEntries()) {
if (entry.isFunction() &&
entry.getFunction().getDecl()->isDistributedGetAccessor()) {
// We avoid emitting _distributed_get accessors, as they cannot be
// referred to anyway
continue;
}
if (Resilient) { if (Resilient) {
if (entry.isFunction()) { if (entry.isFunction()) {
// Define the method descriptor. // Define the method descriptor.

3
test/Distributed/Runtime/distributed_actor_localSystem_distributedProtocol.swift
View File

@@ -14,9 +14,6 @@
// rdar://90373022 // rdar://90373022
// UNSUPPORTED: OS=watchos // UNSUPPORTED: OS=watchos
// rdar://125628060
// UNSUPPORTED: CPU=arm64e
import Distributed import Distributed
@Resolvable @Resolvable

3
test/Distributed/Runtime/distributed_actor_localSystem_distributedProtocol_variable.swift
View File

@@ -14,9 +14,6 @@
// rdar://90373022 // rdar://90373022
// UNSUPPORTED: OS=watchos // UNSUPPORTED: OS=watchos
// rdar://125628060
// UNSUPPORTED: CPU=arm64e
import Distributed import Distributed
@Resolvable @Resolvable

3
test/Distributed/Runtime/distributed_actor_localSystem_manual_conformance.swift
View File

@@ -14,9 +14,6 @@
// rdar://90373022 // rdar://90373022
// UNSUPPORTED: OS=watchos // UNSUPPORTED: OS=watchos
// rdar://125628060
// UNSUPPORTED: CPU=arm64e
import Distributed import Distributed
@available(SwiftStdlib 6.0, *) @available(SwiftStdlib 6.0, *)