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.

Sign up for GitHub

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

Jump to bottom

Show the sign for signed ops on exact_div #66148

Merged
merged 1 commit into from
Dec 3, 2019
Merged

Show the sign for signed ops on exact_div #66148

merged 1 commit into from
Dec 3, 2019

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Nov 6, 2019 •
edited by RalfJung
Loading

r? @RalfJung Cc https://github.com/rust-lang/miri/pull/961/files#r341842128

I'm fairly unhappy with the duplication and the general effort required for this.

Maybe it would be better to add a display impl for ImmTy?

@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 Nov 6, 2019
@Centril
Copy link
Contributor

Centril commented Nov 6, 2019

Maybe it would be better to add a display impl for ImmTy?

No please. :) I think Display impls in the compiler contribute towards implicit dependencies and are harmful wrt. #65031 (comment) due to the orphan rules.

Surely we can de-dup some other way without adding those impls... ^^

@RalfJung
Copy link
Member

RalfJung commented Nov 6, 2019

I think Display impls in the compiler contribute towards implicit dependencies and are harmful wrt. #65031 (comment) due to the orphan rules

I have no idea what this means... Display is defined in libstd so it's a different crate anyway. Also Immediate is not in librustc so it should have a hard time contributing to its compile times.

@Centril
Copy link
Contributor

Centril commented Nov 6, 2019

I have no idea what this means... Display is defined in libstd so it's a different crate anyway.

When I was refactoring libsyntax, there were a bunch of implicit dependencies on e.g. impl Display for syntax::ast::Path which in turn used syntax::print::pprust. The problems is if you move pprust out of libsyntax.

Also Immediate is not in librustc so it should have a hard time contributing to its compile times.

Ah OK, great.

@RalfJung
Copy link
Member

RalfJung commented Nov 6, 2019 •
edited
Loading

@oli-obk Scalar has both a Display and a Debug impl already. I think the Display impl is used when printing the invalid value that we encountered during validity checking; the Debug impl is extremely helpful when debugging CTFE stuff as it makes the Miri trace just so much more readable.^^

For Debug I chose to display hex to work around the sign issue, and anyway we don't have enough type information to determine if we should print this as signed or unsigned. But likely the Display impl is just a bad idea and should be removed (it has the same issue as exact_div, not honoring the sign). I think having a Display impl for ImmTy instead and using that both in exact_div and for validity would be a good idea. Or, if it has to be, a to_string method returning String; I don't think we mind some extra allocations when generating the error message (but it seems silly to me to not use omnipresent abstractions like Display).

Also see #65859, that code also pretty-prints MIR values, so probably all of these cases should share code.

@bors
Copy link
Contributor

bors commented Nov 9, 2019

☔ The latest upstream changes (presumably #66243) made this pull request unmergeable. Please resolve the merge conflicts.

@JohnCSimon JohnCSimon 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 Nov 16, 2019
@JohnCSimon
Copy link
Member

Ping from triage - this PR has sat idle for a while and is now unmergable.
@oli-obk @Centril @RalfJung

@bors
Copy link
Contributor

bors commented Nov 20, 2019

☔ The latest upstream changes (presumably #66578) made this pull request unmergeable. Please resolve the merge conflicts.

@oli-obk oli-obk marked this pull request as ready for review November 26, 2019 13:03
@oli-obk oli-obk 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 Nov 26, 2019
RalfJung
RalfJung approved these changes Dec 2, 2019
View reviewed changes
Copy link
Member

@RalfJung RalfJung left a comment

Choose a reason for hiding this comment

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

LGTM! r=me, but it'd be even better if you could add a test (at least for the sign part) in-tree.

@RalfJung
Copy link
Member

RalfJung commented Dec 3, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Dec 3, 2019

📌 Commit a329756 has been approved by RalfJung

@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 Dec 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Dec 3, 2019
@Centril
Rollup merge of rust-lang#66148 - oli-obk:it_must_be_a_sign, r=RalfJung
3045d22 
Show the sign for signed ops on `exact_div`

r? @RalfJung Cc https://github.com/rust-lang/miri/pull/961/files#r341842128

I'm fairly unhappy with the duplication and the general effort required for this.

Maybe it would be better to add a `display` impl for `ImmTy`?
@Centril Centril mentioned this pull request Dec 3, 2019
Merged
bors added a commit that referenced this pull request Dec 3, 2019
@bors
Auto merge of #66982 - Centril:rollup-yq2281i, r=Centril
f577b0e 
Rollup of 6 pull requests

Successful merges:

 - #66148 (Show the sign for signed ops on `exact_div`)
 - #66651 (Add `enclosing scope` parameter to `rustc_on_unimplemented`)
 - #66904 (Adding docs for keyword match, move)
 - #66935 (syntax: Unify macro and attribute arguments in AST)
 - #66941 (Remove `ord` lang item)
 - #66967 (Remove hack for top-level or-patterns in match checking)

Failed merges:

r? @ghost
@bors bors merged commit a329756 into rust-lang:master Dec 3, 2019
@RalfJung RalfJung mentioned this pull request Dec 3, 2019
Merged
@oli-obk
Copy link
Contributor Author

oli-obk commented Dec 3, 2019

Oh... XD I was working locally on deduplicating the rendering logic from this with the one from constants. I'll open a separate PR and that will also have tests for rustc then

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RalfJung RalfJung RalfJung approved these changes

Assignees

@RalfJung RalfJung

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@oli-obk @rust-highfive @Centril @RalfJung @bors @JohnCSimon