Enable comparing fat pointers #58301
Merged
Conversation
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
rust-highfive
added
the
S-waiting-on-review
oli-obk
reviewed
Feb 8, 2019
|
|
||
| // Handle operations that support pointer values | ||
| if left.is_ptr() || right.is_ptr() || bin_op == mir::BinOp::Offset { | ||
| return M::ptr_op(self, bin_op, left, left_layout, right, right_layout); | ||
| if left.to_scalar_ptr()?.is_ptr() || |
There was a problem hiding this comment.
isn't this problematic for miri? a fat pointer will cause an error here, will it not?
There was a problem hiding this comment.
to_scalar_ptr returns the first component of a scalar pair.
oli-obk
reviewed
Feb 8, 2019
src/librustc_mir/interpret/place.rs
Outdated
| let n = *self.frame().locals[local].access()?; | ||
| let n_layout = self.layout_of(self.tcx.types.usize)?; | ||
| let n = self.read_scalar(OpTy { op: n, layout: n_layout })?; | ||
| let layout = self.layout_of(self.tcx.types.usize)?; |
There was a problem hiding this comment.
Suggested change
| let layout = self.layout_of(self.tcx.types.usize)?; | |
| let layout = self.layout_of(self.tcx.types.usize)?; |
|
@bors r=oli-obk |
|
📌 Commit fd141293def51541872b439a64090c9929653873 has been approved by |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #58316) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
|
Rebased. @bors r=oli-obk |
|
📌 Commit a873d18395c1f90d4ffe13ef28bdbca344115fe9 has been approved by |
bors
added
S-waiting-on-bors
|
Rebased, to integrate with other Miri-related changes (for easier testing). @bors r=oli-obk |
|
📌 Commit 1a5304a has been approved by |
This comment has been minimized.
This comment has been minimized.
|
Fixed rebase fallout. @bors r=oli-obk |
|
📌 Commit 22d5e6a has been approved by |
Centril
added a commit
to Centril/rust
that referenced
this pull request
Feb 14, 2019
Enable comparing fat pointers Also refactor our binops a bit to make that happen more easily. r? @oli-obk
Centril
added a commit
to Centril/rust
that referenced
this pull request
Feb 14, 2019
Enable comparing fat pointers Also refactor our binops a bit to make that happen more easily. r? @oli-obk
bors
added a commit
that referenced
this pull request
Feb 14, 2019
Rollup of 8 pull requests Successful merges: - #57451 (suggestion-diagnostics: as_ref improve snippet) - #57856 (Convert old first edition links to current edition one) - #57992 (Update the future/task API) - #58258 (Reduce the size of `hir::Expr`.) - #58267 (Tweak "incompatible match arms" error) - #58296 (Hidden suggestion support) - #58301 (Enable comparing fat pointers) - #58308 (Extract block to insert an intrinsic into its own function) Failed merges: r? @ghost
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Also refactor our binops a bit to make that happen more easily.
r? @oli-obk