Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump LLVM submodule to fix LLVM assertion failure in MSP430 interrupt generation. #68570

Merged
merged 1 commit into from
Jan 28, 2020

Conversation

cr1901
Copy link
Contributor

@cr1901 cr1901 commented Jan 27, 2020

This PR brings in changes introduced by this cherry-pick to the Rust repository.

Nightlies downloaded from rustup do not appear to have llvm assertions enabled; the assertion failure sometimes causes link errors that shouldn't occur. I couldn't find any indication of other bugs; however, it should still be fixed.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 27, 2020
@alexcrichton
Copy link
Member

Hm this shows that there's a merge conflict, so a rebase may be needed?

@cr1901 cr1901 force-pushed the msp430-fix-1-2020 branch from 142a412 to b0174ec Compare January 27, 2020 15:43
@cr1901
Copy link
Contributor Author

cr1901 commented Jan 27, 2020

Should be fixed now?

@alexcrichton
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Jan 27, 2020

📌 Commit b0174ec has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 27, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 28, 2020
…chton

Bump LLVM submodule to fix LLVM assertion failure in MSP430 interrupt generation.

This PR brings in changes introduced by [this cherry-pick](rust-lang/llvm-project#37) to the Rust repository.

Nightlies downloaded from `rustup` do not appear to have llvm assertions enabled; the assertion failure [sometimes](YuhanLiin/msp430fr2355-quickstart#3) causes link errors that shouldn't occur. I couldn't find any indication of other bugs; however, it should still be fixed.
bors added a commit that referenced this pull request Jan 28, 2020
Rollup of 11 pull requests

Successful merges:

 - #68200 (Stabilize the debug_map_key_value feature)
 - #68383 (Clean up E0205 explanation)
 - #68412 (Clean up E0207 explanation)
 - #68454 (clean up E0214 explanation)
 - #68482 (clean up error codes explanation)
 - #68563 (Don't call `tcx.fn_sig` on closures)
 - #68570 (Bump LLVM submodule to fix LLVM assertion failure in MSP430 interrupt generation.)
 - #68571 (check_match: extract common logic)
 - #68573 (Clean up E0262 explanation)
 - #68575 (Disable the testcase for Vxworks.)
 - #68581 (Add support for icebreakers-cleanup-crew commands)

Failed merges:

r? @ghost
@bors bors merged commit b0174ec into rust-lang:master Jan 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants