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

Move Utilities back to TypeChecker

Browse Source
This commit is contained in:
Robert Widmann
2019-11-06 15:16:53 -08:00
parent fb8b0600ad
commit e6dbfa393a
9 changed files with 88 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Sema/CSGen.cpp
View File

@@ -1242,7 +1242,7 @@ namespace {
case MagicIdentifierLiteralExpr::DSOHandle: {
// #dsohandle has type UnsafeMutableRawPointer.
auto &ctx = CS.getASTContext();
if (ctx.requirePointerArgumentIntrinsics(expr->getLoc()))
if (TypeChecker::requirePointerArgumentIntrinsics(ctx, expr->getLoc()))
return nullptr;
auto unsafeRawPointer = ctx.getUnsafeRawPointerDecl();
@@ -1578,7 +1578,7 @@ namespace {
// Open a member constraint for constructor delegations on the
// subexpr type.
if (ctx.getSelfForInitDelegationInConstructor(CS.DC, expr)) {
if (TypeChecker::getSelfForInitDelegationInConstructor(CS.DC, expr)) {
auto baseTy = CS.getType(expr->getBase())
->getWithoutSpecifierType();
@@ -2853,7 +2853,8 @@ namespace {
/// worth QoI efforts.
Type getOptionalType(SourceLoc optLoc, Type valueTy) {
auto optTy = CS.getTypeChecker().getOptionalType(optLoc, valueTy);
if (!optTy || CS.getASTContext().requireOptionalIntrinsics(optLoc))
if (!optTy ||
TypeChecker::requireOptionalIntrinsics(CS.getASTContext(), optLoc))
return Type();
return optTy;