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

[NFC] Switch some more of the frontend to params

Browse Source
This commit is contained in:
Robert Widmann
2017-06-30 10:23:07 -07:00
parent 91405a7f91
commit 4411223156
6 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Migrator/TupleSplatMigratorPass.cpp
View File

@@ -88,13 +88,7 @@ struct TupleSplatMigratorPass : public ASTMigratorPass,
FunctionType *FuncTy = FC->getType()->getAs<FunctionType>();
unsigned NativeArity = 0;
if (isa<ParenType>(FuncTy->getInput().getPointer())) {
NativeArity = 1;
} else if (auto TT = FuncTy->getInput()->getAs<TupleType>()) {
NativeArity = TT->getNumElements();
}
unsigned NativeArity = FuncTy->getParams().size();
unsigned ClosureArity = Closure->getParameters()->size();
if (NativeArity <= ClosureArity)
return false;
@@ -149,10 +143,10 @@ struct TupleSplatMigratorPass : public ASTMigratorPass,
auto fnTy = E->getFn()->getType()->getAs<FunctionType>();
if (!fnTy)
return false;
auto parenT = dyn_cast<ParenType>(fnTy->getInput().getPointer());
if (!parenT)
if (!(fnTy->getParams().size() == 1 &&
fnTy->getParams().front().getLabel().empty()))
return false;
auto inp = dyn_cast<TupleType>(parenT->getUnderlyingType().getPointer());
auto inp = fnTy->getParams().front().getType()->getAs<TupleType>();
if (!inp)
return false;
if (inp->getNumElements() != 0)