Merged
Conversation
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
kennytm
previously requested changes
May 17, 2018
src/librustc_trans/abi.rs
Outdated
Member
There was a problem hiding this comment.
If y == 0, then x % y will also panic, please move this rem_bytes calculation inside the conditional as well.
kennytm
added
S-waiting-on-author
Collaborator
|
☔ The latest upstream changes (presumably #50615) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
Author
|
Should the test file be added to codegen tests? I've added a ui test because we just want to ensure that the code from the issue passes compilation right? |
Contributor
Author
|
Sorry for the commit spam after rebasing :( I can remove or squash them when I get a sec again |
Member
|
@cjkenn Yes, please |
cjkenn
force-pushed
the
cjkenn/div-by-zero
branch
from
8ae861b to
7094e7f
Compare
Contributor
Author
|
Err hopefully this is better after some more git fiddling -_-... I didn't squash them but the diffs are right. |
Member
|
@cjkenn Could you do a rebase instead of merge? $ git checkout master
$ git pull origin master --ff-only # synchronize master branch with this repository
$ git checkout div-by-zero
$ git rebase master # rebase on top of the latest master
$ git rebase -i master # do more cleanup e.g. squash everything down to a single commit
$ git push cjkenn div-by-zero --force-with-lease |
remove semicolon -_- Add rem_bytes to conditional to avoid error when performing mod by 0 Add test file to confirm compilation passes. Ensure we don't divide or mod by zero in llvm_type. Include test file from issue.
cjkenn
force-pushed
the
cjkenn/div-by-zero
branch
from
987fb20 to
ecce274
Compare
Contributor
Author
|
Ok, I think I've FINALLY got it... Thanks for the git help! |
kennytm
approved these changes
May 19, 2018
Member
kennytm
left a comment
kennytm
left a comment
There was a problem hiding this comment.
r=me after a minor nit is fixed.
src/test/ui/issue-50761.rs
Outdated
|
|
||
| // compile-pass | ||
|
|
||
| #![feature(test)] |
Member
|
@bors r+ |
Collaborator
|
📌 Commit 8d9a87c has been approved by |
bors
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
May 19, 2018
Fix potential divide by zero This should fix rust-lang#50761 I had trouble reproducing with the provided code, but looking at the stack trace would indicate that this code is the likely cause. I made a number of assumptions here, because I don't have enough context on how the register size is set: 1. I assumed `rest.unit.size.bytes()` can be 0, and it's ok if it's set to 0 before this function is called 2. I assumed that if `rest.unit.size.bytes()` is 0, that we want `rest_count` to also be 0.
bors
added a commit
that referenced
this pull request
May 19, 2018
Rollup of 8 pull requests Successful merges: - #50531 (Cleanup uses of TypeIdHasher and replace them with StableHasher) - #50819 (Fix potential divide by zero) - #50827 (Update LLVM to 56c931901cfb85cd6f7ed44c7d7520a8de1edf97) - #50829 (CheckLoopVisitor: also visit break expressions) - #50854 (in which the unused shorthand field pattern debacle/saga continues) - #50858 (Reorder description for snippets in rustdoc documentation) - #50883 (Fix warning when building stage0 libcore) - #50889 (Update clippy) Failed merges:
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
5 participants
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 should fix #50761
I had trouble reproducing with the provided code, but looking at the stack trace would indicate that this code is the likely cause. I made a number of assumptions here, because I don't have enough context on how the register size is set:
rest.unit.size.bytes()can be 0, and it's ok if it's set to 0 before this function is calledrest.unit.size.bytes()is 0, that we wantrest_countto also be 0.