Merge pull request #15093 from gottesmm/pr-e4723efd0cbe9753d85f4f6e30ab35a614063c19

swift-ci · web-flow · commit 23ab6abd2f69 · 2018-03-08T18:34:31.000-08:00
diff --git a/lib/SILGen/SILGenThunk.cpp b/lib/SILGen/SILGenThunk.cpp
@@ -148,6 +148,8 @@ void SILGenFunction::emitCurryThunk(SILDeclRef thunk) {
     (void) fd;
   }
 
+  Scope S(*this, vd);
+
   auto selfTy = vd->getInterfaceType()->castTo<AnyFunctionType>()
     ->getInput();
   selfTy = vd->getInnermostDeclContext()->mapTypeIntoContext(selfTy);
@@ -185,6 +187,7 @@ void SILGenFunction::emitCurryThunk(SILDeclRef thunk) {
           emitCanonicalFunctionThunk(vd, toClosure, closureFnTy, resultFnTy);
     }
   }
+  toClosure = S.popPreservingValue(toClosure);
   B.createReturn(ImplicitReturnLocation::getImplicitReturnLoc(vd), toClosure);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,8 @@ void SILGenFunction::emitCurryThunk(SILDeclRef thunk) {`
`148`	`148`	`(void) fd;`
`149`	`149`	`}`
`150`	`150`
	`151`	`+ Scope S(*this, vd);`
	`152`	`+`
`151`	`153`	`auto selfTy = vd->getInterfaceType()->castTo<AnyFunctionType>()`
`152`	`154`	`->getInput();`
`153`	`155`	`selfTy = vd->getInnermostDeclContext()->mapTypeIntoContext(selfTy);`
`@@ -185,6 +187,7 @@ void SILGenFunction::emitCurryThunk(SILDeclRef thunk) {`
`185`	`187`	`emitCanonicalFunctionThunk(vd, toClosure, closureFnTy, resultFnTy);`
`186`	`188`	`}`
`187`	`189`	`}`
	`190`	`+ toClosure = S.popPreservingValue(toClosure);`
`188`	`191`	`B.createReturn(ImplicitReturnLocation::getImplicitReturnLoc(vd), toClosure);`
`189`	`192`	`}`
`190`	`193`