Merge pull request #14716 from shajrawi/gen_env

swift-ci · web-flow · commit 7e387b7af2a4 · 2018-02-19T14:25:34.000-08:00
diff --git a/lib/IRGen/LoadableByAddress.cpp b/lib/IRGen/LoadableByAddress.cpp
@@ -395,7 +395,11 @@ static SILType getNewSILType(GenericEnvironment *GenericEnv,
     nonOptionalType = optType;
   }
   if (nonOptionalType.getAs<TupleType>()) {
-    return getNewTupleType(GenericEnv, Mod, nonOptionalType, storageType);
+    SILType newSILType =
+        getNewTupleType(GenericEnv, Mod, nonOptionalType, storageType);
+    return isLargeLoadableType(GenericEnv, newSILType, Mod)
+               ? newSILType.getAddressType()
+               : newSILType;
   }
   SILType newSILType = getNewOptionalFunctionType(GenericEnv, storageType, Mod);
   if (newSILType != storageType) {

Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,11 @@ static SILType getNewSILType(GenericEnvironment *GenericEnv,`
`395`	`395`	`nonOptionalType = optType;`
`396`	`396`	`}`
`397`	`397`	`if (nonOptionalType.getAs<TupleType>()) {`
`398`		`- return getNewTupleType(GenericEnv, Mod, nonOptionalType, storageType);`
	`398`	`+ SILType newSILType =`
	`399`	`+ getNewTupleType(GenericEnv, Mod, nonOptionalType, storageType);`
	`400`	`+ return isLargeLoadableType(GenericEnv, newSILType, Mod)`
	`401`	`+ ? newSILType.getAddressType()`
	`402`	`+ : newSILType;`
`399`	`403`	`}`
`400`	`404`	`SILType newSILType = getNewOptionalFunctionType(GenericEnv, storageType, Mod);`
`401`	`405`	`if (newSILType != storageType) {`