Merge pull request #19348 from compnerd/construction-is-difficult

compnerd · web-flow · commit a2898cb63f0f · 2018-09-17T16:53:43.000-07:00
Revert "Revert "SILOptimizer: make a conversion operation explicit""
diff --git a/include/swift/SILOptimizer/Analysis/ARCAnalysis.h b/include/swift/SILOptimizer/Analysis/ARCAnalysis.h
@@ -230,7 +230,7 @@ class ConsumedArgToEpilogueReleaseMatcher {
     Optional<ArrayRef<SILInstruction *>> getFullyPostDomReleases() const {
       if (releases.empty() || foundSomeButNotAllReleases())
         return None;
-      return {releases};
+      return ArrayRef<SILInstruction *>(releases);
     }
 
     /// If we were able to find a set of releases for this argument, but those

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ class ConsumedArgToEpilogueReleaseMatcher {`
`230`	`230`	`Optional<ArrayRef<SILInstruction *>> getFullyPostDomReleases() const {`
`231`	`231`	`if (releases.empty() \|\| foundSomeButNotAllReleases())`
`232`	`232`	`return None;`
`233`		`- return {releases};`
	`233`	`+ return ArrayRef<SILInstruction *>(releases);`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`/// If we were able to find a set of releases for this argument, but those`