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

[Concurrency] Fix arm64e ptrauth violations in Embedded Swift Concurrency

Browse Source
This commit is contained in:
Kuba Mracek
2024-10-28 21:16:48 -07:00
parent 9ee1ddc35e
commit cf7ea301e1
3 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/IRGen/GenConcurrency.cpp
View File

@@ -20,6 +20,7 @@
#include "BitPatternBuilder.h"
#include "ExtraInhabitants.h"
#include "GenCall.h"
#include "GenPointerAuth.h"
#include "GenProto.h"
#include "GenType.h"
#include "IRGenDebugInfo.h"
@@ -584,22 +585,50 @@ struct EmbeddedSwiftResultTypeOptionRecordTraits {
IGF.Builder.CreateStore(
TI.getStaticAlignmentMask(IGF.IGM),
IGF.Builder.CreateStructGEP(optionsRecord, 2, Size()));
auto schema = IGF.getOptions().PointerAuth.ValueWitnesses;
// initializeWithCopy witness
IGF.Builder.CreateStore(
IGF.IGM.getOrCreateValueWitnessFunction(
ValueWitness::InitializeWithCopy, packing, canType, lowered, TI),
IGF.Builder.CreateStructGEP(optionsRecord, 3, Size()));
{
auto gep = IGF.Builder.CreateStructGEP(optionsRecord, 3, Size());
llvm::Value *witness = IGF.IGM.getOrCreateValueWitnessFunction(
ValueWitness::InitializeWithCopy, packing, canType, lowered, TI);
auto discriminator = llvm::ConstantInt::get(
IGF.IGM.Int64Ty,
SpecialPointerAuthDiscriminators::InitializeWithCopy);
auto storageAddress = gep.getAddress();
auto info =
PointerAuthInfo::emit(IGF, schema, storageAddress, discriminator);
if (schema) witness = emitPointerAuthSign(IGF, witness, info);
IGF.Builder.CreateStore(witness, gep);
}
// storeEnumTagSinglePayload witness
IGF.Builder.CreateStore(
IGF.IGM.getOrCreateValueWitnessFunction(
ValueWitness::StoreEnumTagSinglePayload, packing, canType, lowered,
TI),
IGF.Builder.CreateStructGEP(optionsRecord, 4, Size()));
{
auto gep = IGF.Builder.CreateStructGEP(optionsRecord, 4, Size());
llvm::Value *witness = IGF.IGM.getOrCreateValueWitnessFunction(
ValueWitness::StoreEnumTagSinglePayload, packing, canType, lowered,
TI);
auto discriminator = llvm::ConstantInt::get(
IGF.IGM.Int64Ty,
SpecialPointerAuthDiscriminators::StoreEnumTagSinglePayload);
auto storageAddress = gep.getAddress();
auto info =
PointerAuthInfo::emit(IGF, schema, storageAddress, discriminator);
if (schema) witness = emitPointerAuthSign(IGF, witness, info);
IGF.Builder.CreateStore(witness, gep);
}
// destroy witness
IGF.Builder.CreateStore(
IGF.IGM.getOrCreateValueWitnessFunction(ValueWitness::Destroy, packing,
canType, lowered, TI),
IGF.Builder.CreateStructGEP(optionsRecord, 5, Size()));
{
auto gep = IGF.Builder.CreateStructGEP(optionsRecord, 5, Size());
llvm::Value *witness = IGF.IGM.getOrCreateValueWitnessFunction(
ValueWitness::Destroy, packing, canType, lowered, TI);
auto discriminator = llvm::ConstantInt::get(
IGF.IGM.Int64Ty, SpecialPointerAuthDiscriminators::Destroy);
auto storageAddress = gep.getAddress();
auto info =
PointerAuthInfo::emit(IGF, schema, storageAddress, discriminator);
if (schema) witness = emitPointerAuthSign(IGF, witness, info);
IGF.Builder.CreateStore(witness, gep);
}
}
};
} // end anonymous namespace