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

This commit is contained in:
swift_jenkins
2020-07-29 09:03:42 -07:00
73 changed files with 641 additions and 169 deletions

View File

@@ -3423,6 +3423,7 @@ public:
uint8_t(
getStableSelfAccessKind(fn->getSelfAccessKind())),
fn->hasForcedStaticDispatch(),
fn->hasAsync(),
fn->hasThrows(),
S.addGenericSignatureRef(
fn->getGenericSignature()),
@@ -4137,6 +4138,7 @@ public:
getRawStableFunctionTypeRepresentation(fnTy->getRepresentation()),
clangType,
fnTy->isNoEscape(),
fnTy->async(),
fnTy->throws(),
getRawStableDifferentiabilityKind(fnTy->getDifferentiabilityKind()));
@@ -4151,7 +4153,7 @@ public:
GenericFunctionTypeLayout::emitRecord(S.Out, S.ScratchRecord, abbrCode,
S.addTypeRef(fnTy->getResult()),
getRawStableFunctionTypeRepresentation(fnTy->getRepresentation()),
fnTy->throws(),
fnTy->async(), fnTy->throws(),
getRawStableDifferentiabilityKind(fnTy->getDifferentiabilityKind()),
S.addGenericSignatureRef(genericSig));