Merge pull request #14645 from gottesmm/pr-86cb81fb249a0d3f84cc37ca82cddf17caa5c7fa

swift-ci · web-flow · commit a24e7e88bee1 · 2018-02-14T14:59:01.000-08:00
diff --git a/lib/SILGen/SILGenConstructor.cpp b/lib/SILGen/SILGenConstructor.cpp
@@ -428,7 +428,7 @@ void SILGenFunction::emitEnumConstructor(EnumElementDecl *element) {
     B.createReturn(ReturnLoc, emitEmptyTuple(Loc));
   } else {
     assert(enumTI.isLoadable() || !silConv.useLoweredAddresses());
-    SILValue result = mv.forward(*this);
+    SILValue result = mv.ensurePlusOne(*this, ReturnLoc).forward(*this);
     scope.pop();
     B.createReturn(ReturnLoc, result);
   }

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ void SILGenFunction::emitEnumConstructor(EnumElementDecl *element) {`
`428`	`428`	`B.createReturn(ReturnLoc, emitEmptyTuple(Loc));`
`429`	`429`	`} else {`
`430`	`430`	`assert(enumTI.isLoadable() \|\| !silConv.useLoweredAddresses());`
`431`		`- SILValue result = mv.forward(*this);`
	`431`	`+ SILValue result = mv.ensurePlusOne(this, ReturnLoc).forward(this);`
`432`	`432`	`scope.pop();`
`433`	`433`	`B.createReturn(ReturnLoc, result);`
`434`	`434`	`}`