Merge pull request #8337 from hughbe/silgenapply-assertion-fix

slavapestov · web-flow · commit 23c0fea8a59e · 2017-03-25T00:30:02.000-07:00
Fix undefined behaviour caused by accessing uninitialized field after moving CallEmission
diff --git a/lib/SILGen/SILGenApply.cpp b/lib/SILGen/SILGenApply.cpp
@@ -3668,7 +3668,8 @@ namespace {
         : SGF(e.SGF), uncurriedSites(std::move(e.uncurriedSites)),
           extraSites(std::move(e.extraSites)), callee(std::move(e.callee)),
           initialWritebackScope(std::move(e.initialWritebackScope)),
-          uncurries(e.uncurries), applied(e.applied) {
+          uncurries(e.uncurries), applied(e.applied),
+          assumedPlusZeroSelf(e.assumedPlusZeroSelf) {
       e.applied = true;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3668,7 +3668,8 @@ namespace {`
`3668`	`3668`	`: SGF(e.SGF), uncurriedSites(std::move(e.uncurriedSites)),`
`3669`	`3669`	`extraSites(std::move(e.extraSites)), callee(std::move(e.callee)),`
`3670`	`3670`	`initialWritebackScope(std::move(e.initialWritebackScope)),`
`3671`		`- uncurries(e.uncurries), applied(e.applied) {`
	`3671`	`+ uncurries(e.uncurries), applied(e.applied),`
	`3672`	`+ assumedPlusZeroSelf(e.assumedPlusZeroSelf) {`
`3672`	`3673`	`e.applied = true;`
`3673`	`3674`	`}`
`3674`	`3675`