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

Merge remote-tracking branch 'origin/main' into next

Browse Source
This commit is contained in:
swift_jenkins
2020-10-27 18:14:28 -07:00
parent 3979cff642 5910d82a7b
commit 01491db27e
25 changed files with 199 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/IRGen/GenCall.cpp
View File

@@ -103,6 +103,31 @@ AsyncContextLayout irgen::getAsyncContextLayout(
auto parameters = substitutedType->getParameters();
SILFunctionConventions fnConv(substitutedType, IGF.getSILModule());
// AsyncContext * __ptrauth_swift_async_context_parent Parent;
{
auto ty = SILType();
auto &ti = IGF.IGM.getSwiftContextPtrTypeInfo();
valTypes.push_back(ty);
typeInfos.push_back(&ti);
}
// TaskContinuationFunction * __ptrauth_swift_async_context_resume
// ResumeParent;
{
auto ty = SILType();
auto &ti = IGF.IGM.getTaskContinuationFunctionPtrTypeInfo();
valTypes.push_back(ty);
typeInfos.push_back(&ti);
}
// ExecutorRef ResumeParentExecutor;
{
auto ty = SILType();
auto &ti = IGF.IGM.getSwiftExecutorPtrTypeInfo();
valTypes.push_back(ty);
typeInfos.push_back(&ti);
}
// SwiftError *errorResult;
auto errorCanType = IGF.IGM.Context.getExceptionType();
auto errorType = SILType::getPrimitiveObjectType(errorCanType);
@@ -268,11 +293,6 @@ static Alignment getAsyncContextAlignment(IRGenModule &IGM) {
return IGM.getPointerAlignment();
}
static llvm::Value *getAsyncTask(IRGenFunction &IGF) {
// TODO: Return the appropriate task.
return llvm::Constant::getNullValue(IGF.IGM.SwiftTaskPtrTy);
}
llvm::Value *IRGenFunction::getAsyncTask() {
assert(isAsync());
auto *value = CurFn->getArg((unsigned)AsyncFunctionArgumentIndex::Task);
@@ -2167,9 +2187,8 @@ public:
void setArgs(Explosion &llArgs, bool isOutlined,
WitnessMetadata *witnessMetadata) override {
Explosion asyncExplosion;
asyncExplosion.add(llvm::Constant::getNullValue(IGF.IGM.SwiftTaskPtrTy));
asyncExplosion.add(
llvm::Constant::getNullValue(IGF.IGM.SwiftExecutorPtrTy));
asyncExplosion.add(IGF.getAsyncTask());
asyncExplosion.add(IGF.getAsyncExecutor());
asyncExplosion.add(contextBuffer.getAddress());
if (getCallee().getRepresentation() ==
SILFunctionTypeRepresentation::Thick) {
@@ -2178,9 +2197,22 @@ public:
super::setArgs(asyncExplosion, false, witnessMetadata);
SILFunctionConventions fnConv(getCallee().getSubstFunctionType(),
IGF.getSILModule());
// Move all the arguments into the context.
auto layout = getAsyncContextLayout();
// Set caller info into the context.
{ // caller context
Explosion explosion;
explosion.add(IGF.getAsyncContext());
auto fieldLayout = layout.getParentLayout();
saveValue(fieldLayout, explosion, isOutlined);
}
{ // caller executor
Explosion explosion;
explosion.add(IGF.getAsyncExecutor());
auto fieldLayout = layout.getResumeParentExecutorLayout();
saveValue(fieldLayout, explosion, isOutlined);
}
// Move all the arguments into the context.
for (unsigned index = 0, count = layout.getIndirectReturnCount();
index < count; ++index) {
auto fieldLayout = layout.getIndirectReturnLayout(index);
@@ -3360,7 +3392,7 @@ void irgen::emitDeallocYieldManyCoroutineBuffer(IRGenFunction &IGF,
Address irgen::emitTaskAlloc(IRGenFunction &IGF, llvm::Value *size,
Alignment alignment) {
auto *call = IGF.Builder.CreateCall(IGF.IGM.getTaskAllocFn(),
{getAsyncTask(IGF), size});
{IGF.getAsyncTask(), size});
call->setDoesNotThrow();
call->setCallingConv(IGF.IGM.SwiftCC);
call->addAttribute(llvm::AttributeList::FunctionIndex,
@@ -3372,7 +3404,7 @@ Address irgen::emitTaskAlloc(IRGenFunction &IGF, llvm::Value *size,
void irgen::emitTaskDealloc(IRGenFunction &IGF, Address address,
llvm::Value *size) {
auto *call = IGF.Builder.CreateCall(
IGF.IGM.getTaskDeallocFn(), {getAsyncTask(IGF), address.getAddress()});
IGF.IGM.getTaskDeallocFn(), {IGF.getAsyncTask(), address.getAddress()});
call->setDoesNotThrow();
call->setCallingConv(IGF.IGM.SwiftCC);
call->addAttribute(llvm::AttributeList::FunctionIndex,