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

swift-ci · swift-ci · commit e48650cc1270 · 2019-02-06T08:50:05.000-08:00
diff --git a/tools/swift-ide-test/ModuleAPIDiff.cpp b/tools/swift-ide-test/ModuleAPIDiff.cpp
@@ -769,8 +769,10 @@ class SMAModelGenerator : public DeclVisitor<SMAModelGenerator> {
   }
 
   std::vector<sma::TypeName> collectProtocolConformances(NominalTypeDecl *NTD) {
+    const auto AllProtocols = NTD->getAllProtocols();
     std::vector<sma::TypeName> Result;
-    for (const auto *PD : NTD->getAllProtocols()) {
+    Result.reserve(AllProtocols.size());
+    for (const auto *PD : AllProtocols) {
       Result.emplace_back(convertToTypeName(PD->getDeclaredType()));
     }
     return Result;

Original file line number	Diff line number	Diff line change
`@@ -769,8 +769,10 @@ class SMAModelGenerator : public DeclVisitor<SMAModelGenerator> {`
`769`	`769`	`}`
`770`	`770`
`771`	`771`	`std::vector<sma::TypeName> collectProtocolConformances(NominalTypeDecl *NTD) {`
	`772`	`+ const auto AllProtocols = NTD->getAllProtocols();`
`772`	`773`	`std::vector<sma::TypeName> Result;`
`773`		`- for (const auto *PD : NTD->getAllProtocols()) {`
	`774`	`+ Result.reserve(AllProtocols.size());`
	`775`	`+ for (const auto *PD : AllProtocols) {`
`774`	`776`	`Result.emplace_back(convertToTypeName(PD->getDeclaredType()));`
`775`	`777`	`}`
`776`	`778`	`return Result;`