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

This commit is contained in:
swift-ci
2021-07-29 05:53:06 -07:00
27 changed files with 170 additions and 147 deletions

View File

@@ -1500,7 +1500,7 @@ SwiftDeclCollector::constructTypeNode(Type T, TypeInitInfo Info) {
// Still, return type first
Root->addChild(constructTypeNode(Fun->getResult()));
auto Input = AnyFunctionType::composeInput(Fun->getASTContext(),
auto Input = AnyFunctionType::composeTuple(Fun->getASTContext(),
Fun->getParams(),
/*canonicalVararg=*/false);
Root->addChild(constructTypeNode(Input));