diff --git a/clippy_lints/src/transmute.rs b/clippy_lints/src/transmute.rs index b4fed7ae8120..b6ae611da12b 100644 --- a/clippy_lints/src/transmute.rs +++ b/clippy_lints/src/transmute.rs @@ -1,4 +1,6 @@ -use crate::utils::{last_path_segment, match_def_path, paths, snippet, span_lint, span_lint_and_then, sugg}; +use crate::utils::{ + is_normalizable, last_path_segment, match_def_path, paths, snippet, span_lint, span_lint_and_then, sugg, +}; use if_chain::if_chain; use rustc::declare_lint_pass; use rustc::hir::*; @@ -639,8 +641,13 @@ fn get_type_snippet(cx: &LateContext<'_, '_>, path: &QPath<'_>, to_ref_ty: Ty<'_ // check if the component types of the transmuted collection and the result have different ABI, // size or alignment fn is_layout_incompatible<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, from: Ty<'tcx>, to: Ty<'tcx>) -> bool { - let from_ty_layout = cx.tcx.layout_of(ty::ParamEnv::empty().and(from)); - let to_ty_layout = cx.tcx.layout_of(ty::ParamEnv::empty().and(to)); + let empty_param_env = ty::ParamEnv::empty(); + // check if `from` and `to` are normalizable to avoid ICE (#4968) + if !(is_normalizable(cx, empty_param_env, from) && is_normalizable(cx, empty_param_env, to)) { + return false; + } + let from_ty_layout = cx.tcx.layout_of(empty_param_env.and(from)); + let to_ty_layout = cx.tcx.layout_of(empty_param_env.and(to)); if let (Ok(from_layout), Ok(to_layout)) = (from_ty_layout, to_ty_layout) { from_layout.size != to_layout.size || from_layout.align != to_layout.align || from_layout.abi != to_layout.abi } else { diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index ebfa88fabfd6..0680f627bbb6 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -1111,6 +1111,15 @@ pub fn match_function_call<'a, 'tcx>( None } +/// Checks if `Ty` is normalizable. This function is useful +/// to avoid crashes on `layout_of`. +pub fn is_normalizable<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, param_env: ty::ParamEnv<'tcx>, ty: Ty<'tcx>) -> bool { + cx.tcx.infer_ctxt().enter(|infcx| { + let cause = rustc::traits::ObligationCause::dummy(); + infcx.at(&cause, param_env).normalize(&ty).is_ok() + }) +} + #[cfg(test)] mod test { use super::{trim_multiline, without_block_comments}; diff --git a/tests/ui/crashes/auxiliary/use_self_macro.rs b/tests/ui/crashes/auxiliary/use_self_macro.rs new file mode 100644 index 000000000000..a8a85b4baefb --- /dev/null +++ b/tests/ui/crashes/auxiliary/use_self_macro.rs @@ -0,0 +1,15 @@ +macro_rules! use_self { + ( + impl $ty:ident { + fn func(&$this:ident) { + [fields($($field:ident)*)] + } + } + ) => ( + impl $ty { + fn func(&$this) { + let $ty { $($field),* } = $this; + } + } + ) +} diff --git a/tests/ui/ice-2636.rs b/tests/ui/crashes/ice-2636.rs similarity index 100% rename from tests/ui/ice-2636.rs rename to tests/ui/crashes/ice-2636.rs diff --git a/tests/ui/ice-2636.stderr b/tests/ui/crashes/ice-2636.stderr similarity index 100% rename from tests/ui/ice-2636.stderr rename to tests/ui/crashes/ice-2636.stderr diff --git a/tests/ui/crashes/issue-2862.rs b/tests/ui/crashes/ice-2862.rs similarity index 77% rename from tests/ui/crashes/issue-2862.rs rename to tests/ui/crashes/ice-2862.rs index 3587a08eab7e..47324ce18316 100644 --- a/tests/ui/crashes/issue-2862.rs +++ b/tests/ui/crashes/ice-2862.rs @@ -1,6 +1,6 @@ // run-pass -/// Test for https://github.com/rust-lang/rust-clippy/issues/2826 +/// Test for https://github.com/rust-lang/rust-clippy/issues/2862 pub trait FooMap { fn map B>(&self, f: F) -> B; diff --git a/tests/ui/ice-360.rs b/tests/ui/crashes/ice-360.rs similarity index 100% rename from tests/ui/ice-360.rs rename to tests/ui/crashes/ice-360.rs diff --git a/tests/ui/ice-360.stderr b/tests/ui/crashes/ice-360.stderr similarity index 100% rename from tests/ui/ice-360.stderr rename to tests/ui/crashes/ice-360.stderr diff --git a/tests/ui/ice-3717.rs b/tests/ui/crashes/ice-3717.rs similarity index 100% rename from tests/ui/ice-3717.rs rename to tests/ui/crashes/ice-3717.rs diff --git a/tests/ui/ice-3717.stderr b/tests/ui/crashes/ice-3717.stderr similarity index 100% rename from tests/ui/ice-3717.stderr rename to tests/ui/crashes/ice-3717.stderr diff --git a/tests/ui/ice-4121.rs b/tests/ui/crashes/ice-4121.rs similarity index 100% rename from tests/ui/ice-4121.rs rename to tests/ui/crashes/ice-4121.rs diff --git a/tests/ui/ice-4545.rs b/tests/ui/crashes/ice-4545.rs similarity index 100% rename from tests/ui/ice-4545.rs rename to tests/ui/crashes/ice-4545.rs diff --git a/tests/ui/ice-4579.rs b/tests/ui/crashes/ice-4579.rs similarity index 100% rename from tests/ui/ice-4579.rs rename to tests/ui/crashes/ice-4579.rs diff --git a/tests/ui/ice-4671.rs b/tests/ui/crashes/ice-4671.rs similarity index 100% rename from tests/ui/ice-4671.rs rename to tests/ui/crashes/ice-4671.rs diff --git a/tests/ui/ice-4775.rs b/tests/ui/crashes/ice-4775.rs similarity index 100% rename from tests/ui/ice-4775.rs rename to tests/ui/crashes/ice-4775.rs diff --git a/tests/ui/crashes/ice-4968.rs b/tests/ui/crashes/ice-4968.rs new file mode 100644 index 000000000000..3822f1745985 --- /dev/null +++ b/tests/ui/crashes/ice-4968.rs @@ -0,0 +1,20 @@ +// check-pass + +// Test for https://github.com/rust-lang/rust-clippy/issues/4968 + +#![warn(clippy::unsound_collection_transmute)] + +trait Trait { + type Assoc; +} + +use std::mem::{self, ManuallyDrop}; + +#[allow(unused)] +fn func(slice: Vec) { + unsafe { + let _: Vec> = mem::transmute(slice); + } +} + +fn main() {}