-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
fixes rust-lang#52482 #58670
fixes rust-lang#52482 #58670
Conversation
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
r? @oli-obk |
@oli-obk This is the backtrace I get:
|
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
There was a comment, but it disappeared. Did you resolve your problem? |
☔ The latest upstream changes (presumably #58321) made this pull request unmergeable. Please resolve the merge conflicts. |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
5df9449
to
2123539
Compare
@oli-obk Made some changes to fix 1. Can you please have a look at it? |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you have still some more fallout to address. I think the failing code just needs to use your new function.
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
@oli-obk When trying to fix 2 of #52482 I am getting a panic. This is what i tried: rust/src/librustc_passes/rvalue_promotion.rs Lines 320 to 328 in 2e2f145
This is the backtrace:
Spent some time on this but could not figure it out :(. Specifically, how does this issue occur at compile time? It should be a runtime issue right? |
The issue is that rust/src/librustc_mir/transform/qualify_consts.rs Lines 711 to 715 in 626e74d
except that you don't unwrap the |
rust/src/librustc_passes/rvalue_promotion.rs Lines 319 to 332 in 867af81
If I do this I get a panic
This panic arises arises in the code snippet you have mentioned(from This seems confusing. So I changed the code in |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
I have a general request. If it's not too much trouble, please include a commit message that says something about the content of the commit. It makes tracking the changes easier during review. There's no need to produce a high quality commit message for these commits, just anything related to why or what is changed. |
Totally agree. My plan was to squash all commits to a single commit once everything works fine. I did not anticipate that having meaningful commit messages helps during the review. Will keep this in mind. Sorry if this made the review process harder :( |
b1f3629
to
c9edcab
Compare
@oli-obk Everything seems to be fine now. |
Fixed. The only remaining question is
I am looking at this. Should we move this discussion to a different PR? Also, I am really eager to get this one merged :P |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just two more nits, then this is ready to merge
Yes that makes sense |
Done with the changes. Squash all commits? |
yes |
4e5bc4f
to
9902f8c
Compare
@bors r+ |
📌 Commit 9902f8c has been approved by |
Shall I go ahead and create a separate PR for this? |
I haven't looked at the code in detail, so there might be a good reason the code is written the way it is. I don't think there is, so I'd be glad if you tried to improve it, but please be aware that you might end up doing some work and then realize it can't be done at all. |
…k_kinds, r=oli-obk fixes rust-lang#52482
…k_kinds, r=oli-obk fixes rust-lang#52482
…k_kinds, r=oli-obk fixes rust-lang#52482
Rollup of 13 pull requests Successful merges: - #58518 (Use early unwraps instead of bubbling up errors just to unwrap in the end) - #58626 (rustdoc: add option to calculate "documentation coverage") - #58629 (rust-lldb: fix crash when printing empty string) - #58660 (MaybeUninit: add read_initialized, add examples) - #58670 (fixes #52482) - #58676 (look for python2 symlinks before bootstrap python) - #58679 (Refactor passes and pass execution to be more parallel) - #58750 (Make `Unique::as_ptr`, `NonNull::dangling` and `NonNull::cast` const) - #58762 (Mention `unwind(aborts)` in diagnostics for `#[unwind]`) - #58924 (Add as_slice() to slice::IterMut and vec::Drain) - #58990 (Actually publish miri in the manifest) - #59018 (std: Delete a by-definition spuriously failing test) - #59045 (Expose new_sub_parser_from_file) Failed merges: r? @ghost
No description provided.