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

Add more array references to raw pointer casts. #31418

Closed
wants to merge 20 commits into from
Closed

Add more array references to raw pointer casts. #31418

Changes from 8 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7bedd3a
Added casting from `&mut [T; n]` to `*mut T`.
Jexell Feb 4, 2016
08001bc
Added casting from `&mut [T; n]` to `*const T`.
Jexell Feb 4, 2016
d73b7ef
Improved comments again.
Jexell Feb 4, 2016
899c074
Update cast.rs
Jexell Feb 4, 2016
177802b
Update cast.rs
Jexell Feb 4, 2016
d0060f4
Improved indention.
Jexell Feb 4, 2016
e8e9c79
Update cast.rs
Jexell Feb 4, 2016
9024d5b
Removed an unnecessary space.
Jexell Feb 4, 2016
43b5f4e
Replaced tabs with spaces.
Jexell Feb 26, 2016
19441c1
Added files via upload
Jexell Feb 26, 2016
6c63426
Update cast.rs
Jexell Feb 26, 2016
510a2a9
Corrected formatting.
Jexell Feb 27, 2016
35244df
Removed trailing whitespace.
Jexell Feb 27, 2016
3ef43ff
Delete cast-mut-ref-to-const-ptr.rs
Jexell Feb 27, 2016
945ef71
Added files via upload
Jexell Feb 27, 2016
456537b
The casts that this file checks are now allowed.
Jexell Feb 27, 2016
2e72108
Shortened test.
Jexell Feb 27, 2016
e384e3a
Removed an unnecessary unsafe block.
Jexell Feb 27, 2016
ded897c
Shortened cast.rs.
Jexell Feb 27, 2016
5385c68
Update cast-mut-ref-to-const-ptr.rs
Jexell Feb 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/librustc_typeck/check/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
//! A cast `e as U` is valid if one of the following holds:
//! * `e` has type `T` and `T` coerces to `U`; *coercion-cast*
//! * `e` has type `*T`, `U` is `*U_0`, and either `U_0: Sized` or
//! unsize_kind(`T`) = unsize_kind(`U_0`); *ptr-ptr-cast*
//! unsize_kind(`T`) = unsize_kind(`U_0`); *ptr-ptr-cast*
//! * `e` has type `*T` and `U` is a numeric type, while `T: Sized`; *ptr-addr-cast*
//! * `e` is an integer and `U` is `*U_0`, while `U_0: Sized`; *addr-ptr-cast*
//! * `e` has type `T` and `T` and `U` are any numeric types; *numeric-cast*
//! * `e` is a C-like enum and `U` is an integer type; *enum-cast*
//! * `e` has type `bool` or `char` and `U` is an integer; *prim-int-cast*
//! * `e` has type `u8` and `U` is `char`; *u8-char-cast*
//! * `e` has type `&[T; n]` and `U` is `*const T`; *array-ptr-cast*
//! * `e` has type `&.[T; n]` and `U` is `*T`,
//! while if `e` is `&[T; n]` then `U` is `*const T`; *array-ptr-cast*
//! * `e` is a function pointer type and `U` has type `*T`,
//! while `T: Sized`; *fptr-ptr-cast*
//! * `e` is a function pointer type and `U` is an integer; *fptr-addr-cast*
Expand Down Expand Up @@ -345,7 +346,7 @@ impl<'tcx> CastCheck<'tcx> {
{
// array-ptr-cast.

if m_expr.mutbl == hir::MutImmutable && m_cast.mutbl == hir::MutImmutable {
if !(m_expr.mutbl == hir::MutImmutable && m_cast.mutbl == hir::MutMutable) {
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this is correct - this would only allow casts from &[T; n] to *mut T, whereas you want casts from immutable to const and mut to mut.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It should do the opposite of that due to the ! at the front and only accept casts that are not
&[T; n] to *mut T. The other 3 casts work with a version of rustc that contains this change.

if let ty::TyArray(ety, _) = m_expr.ty.sty {
// Due to the limitations of LLVM global constants,
// region pointers end up pointing at copies of
Expand Down