---

yaml
---
r: 346734
b: refs/heads/master
c: 2830b0d
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 89b29e1cdae194230cc2455f3bd19b640c2880e8
+refs/heads/master: 2830b0d6d2a26954c5a669aefa3157bb5977b033
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/TypeCheckerTypeIDZone.def

@@ -23,4 +23,4 @@ SWIFT_TYPEID(IsDynamicRequest)
 SWIFT_TYPEID(RequirementRequest)
 SWIFT_TYPEID(USRGenerationRequest)
 SWIFT_TYPEID(DefaultTypeRequest)
-SWIFT_TYPEID(MangleLocalTypeDeclRequest)
+SWIFT_TYPEID(MangleLocalTypeDeclRequest)

trunk/lib/IRGen/GenIntegerLiteral.h

@@ -70,4 +70,4 @@ llvm::Value *emitIntegerLiteralToFP(IRGenFunction &IGF,
 }
 }
 
-#endif
+#endif

trunk/lib/IRGen/LoadableByAddress.cpp

@@ -1607,6 +1607,8 @@ class LoadableByAddress : public SILModuleTransform {
                            SmallVectorImpl<SILInstruction *> &Delete);
   bool recreateApply(SILInstruction &I,
                      SmallVectorImpl<SILInstruction *> &Delete);
+  bool recreateTupleInstr(SILInstruction &I,
+                          SmallVectorImpl<SILInstruction *> &Delete);
   bool recreateConvInstr(SILInstruction &I,
                          SmallVectorImpl<SILInstruction *> &Delete);
   bool recreateBuiltinInstr(SILInstruction &I,
@@ -2617,6 +2619,34 @@ bool LoadableByAddress::fixStoreToBlockStorageInstr(
   return true;
 }
 
+bool LoadableByAddress::recreateTupleInstr(
+    SILInstruction &I, SmallVectorImpl<SILInstruction *> &Delete) {
+  auto *tupleInstr = dyn_cast<TupleInst>(&I);
+  if (!tupleInstr)
+    return false;
+
+  // Check if we need to recreate the tuple:
+  auto *F = tupleInstr->getFunction();
+  auto *currIRMod = getIRGenModule()->IRGen.getGenModule(F);
+  GenericEnvironment *genEnv = F->getGenericEnvironment();
+  auto resultTy = tupleInstr->getType();
+  auto newResultTy = MapperCache.getNewSILType(genEnv, resultTy, *currIRMod);
+  if (resultTy == newResultTy)
+    return true;
+
+  // The tuple type have changed based on its members.
+  // For example if one or more of them are ‘large’ loadable types
+  SILBuilderWithScope tupleBuilder(tupleInstr);
+  SmallVector<SILValue, 8> elems;
+  for (auto elem : tupleInstr->getElements()) {
+    elems.push_back(elem);
+  }
+  auto *newTuple = tupleBuilder.createTuple(tupleInstr->getLoc(), elems);
+  tupleInstr->replaceAllUsesWith(newTuple);
+  Delete.push_back(tupleInstr);
+  return true;
+}
+
 bool LoadableByAddress::recreateConvInstr(SILInstruction &I,
                          SmallVectorImpl<SILInstruction *> &Delete) {
   auto *convInstr = dyn_cast<SingleValueInstruction>(&I);
@@ -2855,7 +2885,9 @@ void LoadableByAddress::run() {
     SmallVector<SILInstruction *, 32> Delete;
     for (SILBasicBlock &BB : CurrF) {
       for (SILInstruction &I : BB) {
-        if (recreateConvInstr(I, Delete))
+        if (recreateTupleInstr(I, Delete))
+          continue;
+        else if (recreateConvInstr(I, Delete))
           continue;
         else if (recreateBuiltinInstr(I, Delete))
           continue;

trunk/validation-test/compiler_crashers_2_fixed/sr9849.swift

@@ -0,0 +1,19 @@
+// RUN: %target-swift-frontend -Xllvm -sil-verify-after-pass=loadable-address -emit-ir -o %t.ll %s
+
+// Just make sure we don't crash.
+
+
+struct Large {
+  var a: Int = 1
+  var b: Int = 1
+  var c: Int = 1
+  var d: Int = 1
+  var e: Int = 1
+  var f: Int = 1
+  var g: Int = 1
+  var h: Int = 1
+}
+
+func test(_ x: Large) -> (Large, (Large) -> Large) {
+  return (x, {$0})
+}