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

[IRGen] Distributed: Fix distributed actor metadata referencing when ObjC interop is disabled

Browse Source
This commit is contained in:
Pavel Yaskevich
2024-03-04 17:45:48 -08:00
parent a4c0d84f7e
commit c00c692c96
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/IRGen/GenDistributed.cpp
View File

@@ -181,8 +181,10 @@ public:
/// Witness metadata is computed lazily upon the first request. /// Witness metadata is computed lazily upon the first request.
WitnessMetadata *getWitnessMetadata(llvm::Value *actorSelf); WitnessMetadata *getWitnessMetadata(llvm::Value *actorSelf);
public: private:
FunctionPointer getPointerToTarget(llvm::Value *actorSelf); FunctionPointer getPointerToTarget(llvm::Value *actorSelf);
llvm::Value *emitMetadataRef(llvm::Value *actorSelf) const;
}; };
class DistributedAccessor { class DistributedAccessor {
@@ -596,7 +598,7 @@ static llvm::Value *lookupWitnessTable(IRGenFunction &IGF, llvm::Value *witness,
witnessTable, llvm::ConstantPointerNull::get(IGM.WitnessTablePtrTy)); witnessTable, llvm::ConstantPointerNull::get(IGM.WitnessTablePtrTy));
IGF.Builder.CreateCondBr(isNull, failBB, contBB); IGF.Builder.CreateCondBr(isNull, failBB, contBB);
// This operation shouldn't fail because the compuler should have // This operation shouldn't fail because the compiler should have
// checked that the given witness conforms to the protocol. If it // checked that the given witness conforms to the protocol. If it
// does fail then accessor should trap. // does fail then accessor should trap.
{ {
@@ -870,6 +872,19 @@ FunctionPointer AccessorTarget::getPointerToTarget(llvm::Value *actorSelf) {
/*secondaryValue=*/nullptr, sig, true); /*secondaryValue=*/nullptr, sig, true);
} }
llvm::Value *AccessorTarget::emitMetadataRef(llvm::Value *actorSelf) const {
auto &IGM = IGF.IGM;
if (!IGM.ObjCInterop) {
llvm::Value *slot =
IGF.Builder.CreateBitCast(actorSelf, IGM.TypeMetadataPtrPtrTy);
return IGF.Builder.CreateLoad(
Address(slot, IGM.TypeMetadataPtrTy, IGM.getPointerAlignment()));
}
return emitHeapMetadataRefForUnknownHeapObject(IGF, actorSelf);
}
Callee AccessorTarget::getCallee(llvm::Value *actorSelf) { Callee AccessorTarget::getCallee(llvm::Value *actorSelf) {
CalleeInfo info{Type, Type, SubstitutionMap()}; CalleeInfo info{Type, Type, SubstitutionMap()};
return {std::move(info), getPointerToTarget(actorSelf), actorSelf}; return {std::move(info), getPointerToTarget(actorSelf), actorSelf};
@@ -887,8 +902,8 @@ WitnessMetadata *AccessorTarget::getWitnessMetadata(llvm::Value *actorSelf) {
assert(protocol); assert(protocol);
witness.SelfMetadata = actorSelf; witness.SelfMetadata = actorSelf;
witness.SelfWitnessTable = lookupWitnessTable( witness.SelfWitnessTable =
IGF, emitHeapMetadataRefForUnknownHeapObject(IGF, actorSelf), protocol); lookupWitnessTable(IGF, emitMetadataRef(actorSelf), protocol);
Witness = witness; Witness = witness;
} }