bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Handle pattern types wrapped in Option in FFI checks

Browse source
This commit is contained in:
Oli Scherer 2025-01-28 11:08:22 +00:00
parent 5bae8ca77c
commit f1f996a4d5
4 changed files with 35 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_lint/src/lib.rs
View file

@ -33,6 +33,7 @@
#![feature(let_chains)] #![feature(let_chains)]
#![feature(rustc_attrs)] #![feature(rustc_attrs)]
#![feature(rustdoc_internals)] #![feature(rustdoc_internals)]
#![feature(try_blocks)]
#![warn(unreachable_pub)] #![warn(unreachable_pub)]
// tidy-alphabetical-end // tidy-alphabetical-end

31
compiler/rustc_lint/src/types.rs
View file

@ -877,6 +877,37 @@ fn ty_is_known_nonnull<'tcx>(
.filter_map(|variant| transparent_newtype_field(tcx, variant)) .filter_map(|variant| transparent_newtype_field(tcx, variant))
.any(|field| ty_is_known_nonnull(tcx, typing_env, field.ty(tcx, args), mode)) .any(|field| ty_is_known_nonnull(tcx, typing_env, field.ty(tcx, args), mode))
} }
ty::Pat(base, pat) => {
ty_is_known_nonnull(tcx, typing_env, *base, mode)
|| Option::unwrap_or_default(
try {
match **pat {
ty::PatternKind::Range { start, end, include_end } => {
match (start, end) {
(Some(start), None) => {
start.try_to_value()?.try_to_bits(tcx, typing_env)? > 0
}
(Some(start), Some(end)) => {
let start =
start.try_to_value()?.try_to_bits(tcx, typing_env)?;
let end =
end.try_to_value()?.try_to_bits(tcx, typing_env)?;
if include_end {
// This also works for negative numbers, as we just need
// to ensure we aren't wrapping over zero.
start > 0 && end >= start
} else {
start > 0 && end > start
}
}
_ => false,
}
}
}
},
)
}
_ => false, _ => false,
} }
} }

4
tests/ui/lint/clashing-extern-fn.rs
View file

@ -499,13 +499,11 @@ mod pattern_types {
extern "C" { extern "C" {
fn pt_non_zero_usize() -> pattern_type!(usize is 1..); fn pt_non_zero_usize() -> pattern_type!(usize is 1..);
fn pt_non_zero_usize_opt() -> Option<pattern_type!(usize is 1..)>; fn pt_non_zero_usize_opt() -> Option<pattern_type!(usize is 1..)>;
//~^ WARN not FFI-safe
fn pt_non_zero_usize_opt_full_range() -> Option<pattern_type!(usize is 0..)>; fn pt_non_zero_usize_opt_full_range() -> Option<pattern_type!(usize is 0..)>;
//~^ WARN not FFI-safe //~^ WARN not FFI-safe
fn pt_non_null_ptr() -> pattern_type!(usize is 1..); fn pt_non_null_ptr() -> pattern_type!(usize is 1..);
fn pt_non_zero_usize_wrapper() -> NonZeroUsize; fn pt_non_zero_usize_wrapper() -> NonZeroUsize;
fn pt_non_zero_usize_wrapper_opt() -> Option<NonZeroUsize>; fn pt_non_zero_usize_wrapper_opt() -> Option<NonZeroUsize>;
//~^ WARN not FFI-safe
} }
} }
mod b { mod b {
@ -515,12 +513,10 @@ mod pattern_types {
// cases are warning for, from both a caller-convenience and optimisation perspective. // cases are warning for, from both a caller-convenience and optimisation perspective.
fn pt_non_zero_usize() -> usize; fn pt_non_zero_usize() -> usize;
fn pt_non_zero_usize_opt() -> usize; fn pt_non_zero_usize_opt() -> usize;
//~^ WARN `pt_non_zero_usize_opt` redeclared with a different signature
fn pt_non_null_ptr() -> *const (); fn pt_non_null_ptr() -> *const ();
//~^ WARN `pt_non_null_ptr` redeclared with a different signature //~^ WARN `pt_non_null_ptr` redeclared with a different signature
fn pt_non_zero_usize_wrapper() -> usize; fn pt_non_zero_usize_wrapper() -> usize;
fn pt_non_zero_usize_wrapper_opt() -> usize; fn pt_non_zero_usize_wrapper_opt() -> usize;
//~^ WARN `pt_non_zero_usize_wrapper_opt` redeclared with a different signature
} }
} }
} }

48
tests/ui/lint/clashing-extern-fn.stderr
View file

@ -17,17 +17,8 @@ LL | fn hidden_niche_unsafe_cell() -> Option<UnsafeCell<NonZero<usiz
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum = help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
= note: enum has no representation hint = note: enum has no representation hint
warning: `extern` block uses type `Option<(usize) is 1..=>`, which is not FFI-safe
--> $DIR/clashing-extern-fn.rs:501:43
|
LL | fn pt_non_zero_usize_opt() -> Option<pattern_type!(usize is 1..)>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
= note: enum has no representation hint
warning: `extern` block uses type `Option<(usize) is 0..=>`, which is not FFI-safe warning: `extern` block uses type `Option<(usize) is 0..=>`, which is not FFI-safe
--> $DIR/clashing-extern-fn.rs:503:54 --> $DIR/clashing-extern-fn.rs:502:54
| |
LL | fn pt_non_zero_usize_opt_full_range() -> Option<pattern_type!(usize is 0..)>; LL | fn pt_non_zero_usize_opt_full_range() -> Option<pattern_type!(usize is 0..)>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
@ -35,15 +26,6 @@ LL | fn pt_non_zero_usize_opt_full_range() -> Option<pattern_type!(u
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum = help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
= note: enum has no representation hint = note: enum has no representation hint
warning: `extern` block uses type `Option<NonZeroUsize>`, which is not FFI-safe
--> $DIR/clashing-extern-fn.rs:507:51
|
LL | fn pt_non_zero_usize_wrapper_opt() -> Option<NonZeroUsize>;
| ^^^^^^^^^^^^^^^^^^^^ not FFI-safe
|
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
= note: enum has no representation hint
warning: `clash` redeclared with a different signature warning: `clash` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:13:13 --> $DIR/clashing-extern-fn.rs:13:13
| |
@ -285,20 +267,8 @@ LL | fn hidden_niche_unsafe_cell() -> Option<UnsafeCell<NonZero<usiz
= note: expected `unsafe extern "C" fn() -> usize` = note: expected `unsafe extern "C" fn() -> usize`
found `unsafe extern "C" fn() -> Option<UnsafeCell<NonZero<usize>>>` found `unsafe extern "C" fn() -> Option<UnsafeCell<NonZero<usize>>>`
warning: `pt_non_zero_usize_opt` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:517:13
|
LL | fn pt_non_zero_usize_opt() -> Option<pattern_type!(usize is 1..)>;
| ------------------------------------------------------------------ `pt_non_zero_usize_opt` previously declared here
...
LL | fn pt_non_zero_usize_opt() -> usize;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this signature doesn't match the previous declaration
|
= note: expected `unsafe extern "C" fn() -> Option<(usize) is 1..=>`
found `unsafe extern "C" fn() -> usize`
warning: `pt_non_null_ptr` redeclared with a different signature warning: `pt_non_null_ptr` redeclared with a different signature
--> $DIR/clashing-extern-fn.rs:519:13 --> $DIR/clashing-extern-fn.rs:516:13
| |
LL | fn pt_non_null_ptr() -> pattern_type!(usize is 1..); LL | fn pt_non_null_ptr() -> pattern_type!(usize is 1..);
| ---------------------------------------------------- `pt_non_null_ptr` previously declared here | ---------------------------------------------------- `pt_non_null_ptr` previously declared here
@ -309,17 +279,5 @@ LL | fn pt_non_null_ptr() -> *const ();
= note: expected `unsafe extern "C" fn() -> (usize) is 1..=` = note: expected `unsafe extern "C" fn() -> (usize) is 1..=`
found `unsafe extern "C" fn() -> *const ()` found `unsafe extern "C" fn() -> *const ()`
warning: `pt_non_zero_usize_wrapper_opt` redeclared with a different signature warning: 24 warnings emitted
--> $DIR/clashing-extern-fn.rs:522:13
|
LL | fn pt_non_zero_usize_wrapper_opt() -> Option<NonZeroUsize>;
| ----------------------------------------------------------- `pt_non_zero_usize_wrapper_opt` previously declared here
...
LL | fn pt_non_zero_usize_wrapper_opt() -> usize;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this signature doesn't match the previous declaration
|
= note: expected `unsafe extern "C" fn() -> Option<NonZeroUsize>`
found `unsafe extern "C" fn() -> usize`
warning: 28 warnings emitted