Please merge c2dafe12dc24f7f1326f5c4c6a3b23f1485f1bd6 into release/10.x

[nathanchance]

Bugzilla Link	45433
Resolution	FIXED
Resolved on	Apr 16, 2020 11:13
Version	10.0
OS	Windows NT
Blocks	#44654
CC	@tstellar
Fixed by commit(s)	c2dafe1 5fbba36

Extended Description

Commit c2dafe1 ("[SimplifyCFG] Skip merging return blocks if it would break a CallBr.") fixes an assertion seen when building the s390 Linux kernel. I have verified that it builds, passes ninja check-llvm, and fixes the issue.

[nathanchance]

assigned to @topperc

[tstellar]

Hi Craig,

Is this safe to backport?

https://reviews.llvm.org/rGc2dafe12dc24f7f1326f5c4c6a3b23f1485f1bd6

[topperc]

I think it should be safe to backport.

[tstellar]

Merged: 5fbba36