Merge pull request #3508 from gregomni/bug2059

gregomni · web-flow · commit f8a1e31fe4c0 · 2016-07-14T07:11:48.000-07:00
[SILGen] Memory management bug fix here for indirect nested enums in switch cases.
diff --git a/lib/SILGen/SILGenPattern.cpp b/lib/SILGen/SILGenPattern.cpp
@@ -2275,8 +2275,7 @@ void SILGenFunction::emitSwitchStmt(SwitchStmt *S) {
             
             for (auto cmv : argArray) {
               if (cmv.getValue() == value) {
-                if (cmv.hasCleanup())
-                  B.createRetainValue(CurrentSILLoc, value, Atomicity::Atomic);
+                B.createRetainValue(CurrentSILLoc, value, Atomicity::Atomic);
                 break;
               }
             }

Original file line number	Diff line number	Diff line change
`@@ -2275,8 +2275,7 @@ void SILGenFunction::emitSwitchStmt(SwitchStmt *S) {`
`2275`	`2275`
`2276`	`2276`	`for (auto cmv : argArray) {`
`2277`	`2277`	`if (cmv.getValue() == value) {`
`2278`		`- if (cmv.hasCleanup())`
`2279`		`- B.createRetainValue(CurrentSILLoc, value, Atomicity::Atomic);`
	`2278`	`+ B.createRetainValue(CurrentSILLoc, value, Atomicity::Atomic);`
`2280`	`2279`	`break;`
`2281`	`2280`	`}`
`2282`	`2281`	`}`