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 pull request #70866 from kavon/ncgenerics-stdlib-building-v4

Browse Source 
Build Stdlib with Noncopyable Generics (Part 4)
This commit is contained in:
Kavon Farvardin
2024-01-25 07:09:38 -08:00
committed by GitHub
parent 68e852ee1b 970c45eab2
commit b8cd7effeb
84 changed files with 802 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Sema/DerivedConformances.cpp
View File

@@ -462,8 +462,6 @@ CallExpr *
DerivedConformance::createBuiltinCall(ASTContext &ctx,
BuiltinValueKind builtin,
ArrayRef<Type> typeArgs,
ArrayRef<ProtocolConformanceRef>
conformances,
ArrayRef<Expr *> args) {
auto name = ctx.getIdentifier(getBuiltinName(builtin));
auto decl = getBuiltinValueDecl(ctx, name);
@@ -472,8 +470,21 @@ DerivedConformance::createBuiltinCall(ASTContext &ctx,
ConcreteDeclRef declRef = decl;
auto fnType = decl->getInterfaceType();
if (auto genericFnType = fnType->getAs<GenericFunctionType>()) {
auto builtinModule = decl->getModuleContext();
auto generics = genericFnType->getGenericSignature();
auto subs = SubstitutionMap::get(generics, typeArgs, conformances);
auto genericParams = generics.getGenericParams();
assert(genericParams.size() == typeArgs.size());
TypeSubstitutionMap map;
for (auto i : indices(genericParams))
map.insert({genericParams[i]->getCanonicalType()
->getAs<SubstitutableType>(),
typeArgs[i]});
auto subs = SubstitutionMap::get(generics,
QueryTypeSubstitutionMap{map},
LookUpConformanceInModule{builtinModule});
declRef = ConcreteDeclRef(decl, subs);
fnType = genericFnType->substGenericArgs(subs);
} else {