Rebase on master and resolve conflicts

Harlan Haskins · Harlan Haskins · commit c31d7f808a82 · 2018-08-15T11:22:09.000-07:00
diff --git a/include/swift/AST/Evaluator.h b/include/swift/AST/Evaluator.h
@@ -372,7 +372,6 @@ class Evaluator {
   template<
       typename Request,
       typename std::enable_if<!Request::hasExternalCache>::type * = nullptr>
-  typename Request::OutputType getResultCached(const Request &request) {
   llvm::Expected<typename Request::OutputType>
   getResultCached(const Request &request) {
     AnyRequest anyRequest{request};
diff --git a/lib/AST/NameLookup.cpp b/lib/AST/NameLookup.cpp
@@ -758,8 +758,9 @@ UnqualifiedLookup::UnqualifiedLookup(DeclName Name, DeclContext *DC,
         // "Self" constraints that can affect name lookup.
         if (isa<ProtocolDecl>(nominal)) {
           if (auto ext = dyn_cast<ExtensionDecl>(dc)) {
-            for (auto bound :
-                    Ctx.evaluator(SelfBoundsFromWhereClauseRequest{ext}))
+            auto bounds = evaluateOrDefault(Ctx.evaluator,
+              SelfBoundsFromWhereClauseRequest{ext}, {});
+            for (auto bound : bounds)
               lookupDecls.push_back(bound);
           }
         }
@@ -843,8 +844,9 @@ UnqualifiedLookup::UnqualifiedLookup(DeclName Name, DeclContext *DC,
           // "Self" constraints that can affect name lookup.
           if (isa<ProtocolDecl>(nominal)) {
             if (auto ext = dyn_cast<ExtensionDecl>(dc)) {
-              for (auto bound :
-                       Ctx.evaluator(SelfBoundsFromWhereClauseRequest{ext}))
+              auto bounds = evaluateOrDefault(Ctx.evaluator,
+                SelfBoundsFromWhereClauseRequest{ext}, {});
+              for (auto bound : bounds)
                 lookupDecls.push_back(bound);
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -758,8 +758,9 @@ UnqualifiedLookup::UnqualifiedLookup(DeclName Name, DeclContext *DC,`
`758`	`758`	`// "Self" constraints that can affect name lookup.`
`759`	`759`	`if (isa<ProtocolDecl>(nominal)) {`
`760`	`760`	`if (auto ext = dyn_cast<ExtensionDecl>(dc)) {`
`761`		`- for (auto bound :`
`762`		`- Ctx.evaluator(SelfBoundsFromWhereClauseRequest{ext}))`
	`761`	`+ auto bounds = evaluateOrDefault(Ctx.evaluator,`
	`762`	`+ SelfBoundsFromWhereClauseRequest{ext}, {});`
	`763`	`+ for (auto bound : bounds)`
`763`	`764`	`lookupDecls.push_back(bound);`
`764`	`765`	`}`
`765`	`766`	`}`
`@@ -843,8 +844,9 @@ UnqualifiedLookup::UnqualifiedLookup(DeclName Name, DeclContext *DC,`
`843`	`844`	`// "Self" constraints that can affect name lookup.`
`844`	`845`	`if (isa<ProtocolDecl>(nominal)) {`
`845`	`846`	`if (auto ext = dyn_cast<ExtensionDecl>(dc)) {`
`846`		`- for (auto bound :`
`847`		`- Ctx.evaluator(SelfBoundsFromWhereClauseRequest{ext}))`
	`847`	`+ auto bounds = evaluateOrDefault(Ctx.evaluator,`
	`848`	`+ SelfBoundsFromWhereClauseRequest{ext}, {});`
	`849`	`+ for (auto bound : bounds)`
`848`	`850`	`lookupDecls.push_back(bound);`
`849`	`851`	`}`
`850`	`852`	`}`