Merge pull request #17491 from bob-wilson/conditionalrequirements-fix

bob-wilson · web-flow · commit 2a1a092a116d · 2018-06-25T16:51:30.000-07:00
[master-next] Adjust syntax for setting an Optional member
diff --git a/lib/AST/ProtocolConformance.cpp b/lib/AST/ProtocolConformance.cpp
@@ -861,7 +861,7 @@ void SpecializedProtocolConformance::computeConditionalRequirements() const {
     auto &ctxt = getProtocol()->getASTContext();
     ConditionalRequirements = ctxt.AllocateCopy(newReqs);
   } else {
-    ConditionalRequirements = {};
+    ConditionalRequirements = Optional<ArrayRef<Requirement>>();
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,7 @@ void SpecializedProtocolConformance::computeConditionalRequirements() const {`
`861`	`861`	`auto &ctxt = getProtocol()->getASTContext();`
`862`	`862`	`ConditionalRequirements = ctxt.AllocateCopy(newReqs);`
`863`	`863`	`} else {`
`864`		`- ConditionalRequirements = {};`
	`864`	`+ ConditionalRequirements = Optional<ArrayRef<Requirement>>();`
`865`	`865`	`}`
`866`	`866`	`}`
`867`	`867`