Bump LLVM submodule to fix LLVM assertion failure in MSP430 interrupt generation.#68570
Merged
bors merged 1 commit intorust-lang:masterfrom Jan 28, 2020
Merged
Bump LLVM submodule to fix LLVM assertion failure in MSP430 interrupt generation.#68570bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
Contributor
|
Member
|
Hm this shows that there's a merge conflict, so a rebase may be needed? |
142a412 to
b0174ec
Compare
Contributor
Author
|
Should be fixed now? |
Member
|
@bors: r+ rollup |
Collaborator
|
📌 Commit b0174ec has been approved by |
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR brings in changes introduced by this cherry-pick to the Rust repository.
Nightlies downloaded from
rustupdo 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.