[MERGE #6096 @MikeHolman] [release/1.11] make EndSwitch flush cases to the EndSwitch offset

MikeHolman · MikeHolman · commit ea0491305137 · 2019-04-22T16:58:45.000-07:00
Merge pull request #6096 from MikeHolman:endswitch_1.11 Cherry-picking #6072 to release/1.11
diff --git a/lib/Backend/SwitchIRBuilder.cpp b/lib/Backend/SwitchIRBuilder.cpp
@@ -163,7 +163,7 @@ SwitchIRBuilder::BeginSwitch()
 void
 SwitchIRBuilder::EndSwitch(uint32 offset, uint32 targetOffset)
 {
-    FlushCases(targetOffset);
+    FlushCases(offset);
     AssertMsg(m_caseNodes->Count() == 0, "Not all switch case nodes built by end of switch");
 
     // only generate the final unconditional jump at the end of the switch

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ SwitchIRBuilder::BeginSwitch()`
`163`	`163`	`void`
`164`	`164`	`SwitchIRBuilder::EndSwitch(uint32 offset, uint32 targetOffset)`
`165`	`165`	`{`
`166`		`- FlushCases(targetOffset);`
	`166`	`+ FlushCases(offset);`
`167`	`167`	`AssertMsg(m_caseNodes->Count() == 0, "Not all switch case nodes built by end of switch");`
`168`	`168`
`169`	`169`	`// only generate the final unconditional jump at the end of the switch`