Skip to content

Relax a debug assertion for dyn principal *equality* in codegen - #130863

Merged
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:relax-codegen-dyn-assert
Oct 2, 2024
Merged

Relax a debug assertion for dyn principal *equality* in codegen#130863
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:relax-codegen-dyn-assert

Conversation

@compiler-errors

@compiler-errorscompiler-errors commented Sep 26, 2024

Copy link
Copy Markdown
Contributor

Maybe this sucks and I should just bite the bullet and use infcx.sub here. Thoughts?

r? lcnr

Fixes#130855

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 26, 2024
@rustbot

rustbot commented Sep 26, 2024

Copy link
Copy Markdown
Collaborator

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
compiler-errors
compiler-errors commented Sep 26, 2024
View reviewed changes
Comment threadlibrary/core/src/ops/unsize.rs
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lcnr

lcnr commented Sep 26, 2024

Copy link
Copy Markdown
Contributor

I would like to go with (something like) relate_types here 🤔 because rn this debug assertions wouldn't trigger if we're contravariant by accident. would also be fine with merging this as is 🤷

@compiler-errors

compiler-errors commented Sep 27, 2024

Copy link
Copy Markdown
ContributorAuthor

Nah, I can add a relate_types-esque fn; I'll just import rustc_trait_selection into codegen_ssa, it shouldn't hurt.

@rustbot author

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 27, 2024
@rustbot

rustbot commented Sep 28, 2024

Copy link
Copy Markdown
Collaborator

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@compiler-errors

compiler-errors commented Sep 28, 2024

Copy link
Copy Markdown
ContributorAuthor

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 28, 2024
compiler-errors
compiler-errors commented Sep 29, 2024
View reviewed changes
Comment threadcompiler/rustc_codegen_ssa/src/base.rs Outdated
@rustbot

rustbot commented Sep 30, 2024

Copy link
Copy Markdown
Collaborator

Some changes occurred in engine.rs, potentially modifying the public API of ObligationCtxt.

cc @lcnr, @compiler-errors

@compiler-errors

compiler-errors commented Sep 30, 2024

Copy link
Copy Markdown
ContributorAuthor

This PR is ready. I'd rather not continue going back and forth here. If you're not happy with the state of this PR, then I'd rather just revert the addition of these debug assertions completely, bc working on this PR and the others has turned into somewhat of a headache :(

lcnr
lcnr reviewed Oct 2, 2024
View reviewed changes
Comment threadcompiler/rustc_codegen_ssa/src/base.rs
&ObligationCause::dummy(),
hr_target_principal,
hr_source_principal,
),

@lcnrlcnrOct 2, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me regardless, but

is adding ocx.eq_trace necessary or can we simply use ocx.eq here given that we don't care about diagnostics at all

@compiler-errorscompiler-errorsOct 2, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ExistentialTraitRef does not implement ToTrace. Wanted to avoid that since it's almost always wrong compared to using the binders for the trace, and the new trait solver has relate_no_trace which avoids that.

@compiler-errors

compiler-errors commented Oct 2, 2024

Copy link
Copy Markdown
ContributorAuthor

@bors r=lcnr rollup

@bors

bors commented Oct 2, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit cbb5047 has been approved by lcnr

It is now in the queue for this repository.

@borsbors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 2, 2024
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 2, 2024
@matthiaskrgrmatthiaskrgr mentioned this pull request Oct 2, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 2, 2024
@bors
Auto merge ofrust-lang#131158- matthiaskrgr:rollup-3x2vado, r=matth…
5384697
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#130863 (Relax a debug assertion for dyn principal *equality* in codegen)
- rust-lang#131016 (Apple: Do not specify an SDK version in `rlib` object files)
- rust-lang#131140 (Handle `rustc_hir_analysis` cases of `potential_query_instability` lint)
- rust-lang#131141 (mpmc doctest: make sure main thread waits for child threads)
- rust-lang#131150 (only query `params_in_repr` if def kind is adt)
- rust-lang#131151 (Replace zero-width whitespace with a visible `\` in the PR template)
- rust-lang#131152 (Improve const traits diagnostics for new desugaring)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit f9ba552 into rust-lang:masterOct 2, 2024
@rustbotrustbot added this to the 1.83.0 milestone Oct 2, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 2, 2024
@rust-timer
Unrolled build forrust-lang#130863
1959d9f
Rollup merge of rust-lang#130863 - compiler-errors:relax-codegen-dyn-assert, r=lcnr
Relax a debug assertion for dyn principal *equality* in codegen
Maybe this sucks and I should just bite the bullet and use `infcx.sub` here. Thoughts?
r? lcnr
Fixesrust-lang#130855
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lcnrlcnrlcnr left review comments

Assignees

@lcnrlcnr

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.83.0

Development

Successfully merging this pull request may close these issues.

ICE: NOP unsize vtable changed principal trait ref

5 participants

@compiler-errors@rustbot@rust-log-analyzer@lcnr@bors