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

swift-ci · swift-ci · commit ac81720b3966 · 2018-11-13T19:49:54.000-08:00
diff --git a/lib/ParseSIL/ParseSIL.cpp b/lib/ParseSIL/ParseSIL.cpp
@@ -264,7 +264,7 @@ namespace {
         return true;
       }
 
-      Result = ValueOwnershipKind(*Iter);
+      Result = T(*Iter);
       return false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ namespace {`
`264`	`264`	`return true;`
`265`	`265`	`}`
`266`	`266`
`267`		`- Result = ValueOwnershipKind(*Iter);`
	`267`	`+ Result = T(*Iter);`
`268`	`268`	`return false;`
`269`	`269`	`}`
`270`	`270`