LLVM Bugzilla is read-only and represents the historical archive of all LLVM issues filled before November 26, 2021. Use github to submit LLVM bugs

Bug 45433 - Please merge c2dafe12dc24f7f1326f5c4c6a3b23f1485f1bd6 into release/10.x
Summary: Please merge c2dafe12dc24f7f1326f5c4c6a3b23f1485f1bd6 into release/10.x
Status: RESOLVED FIXED
Alias: None
Product: new-bugs
Classification: Unclassified
Component: new bugs (show other bugs)
Version: 10.0
Hardware: PC Windows NT
: P enhancement
Assignee: Craig Topper
URL:
Keywords:
Depends on:
Blocks: release-10.0.1
  Show dependency tree
 
Reported: 2020-04-04 21:56 PDT by Nathan Chancellor
Modified: 2020-04-16 11:13 PDT (History)
3 users (show)

See Also:
Fixed By Commit(s): c2dafe12dc24f7f1326f5c4c6a3b23f1485f1bd6 5fbba36cbe9

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Nathan Chancellor 2020-04-04 21:56:56 PDT 
Commit c2dafe12dc2 ("[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.
Comment 1 Tom Stellard 2020-04-14 21:04:19 PDT 
Hi Craig,

Is this safe to backport?

https://reviews.llvm.org/rGc2dafe12dc24f7f1326f5c4c6a3b23f1485f1bd6
Comment 2 Craig Topper 2020-04-14 21:53:43 PDT 
I think it should be safe to backport.
Comment 3 Tom Stellard 2020-04-16 11:13:50 PDT 
Merged: 5fbba36cbe9