From bf67fcf5a964e4c25a69148fdb49f1348108d6d1 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 2 Jan 2020 11:48:06 +0900 Subject: [PATCH] Move `is_normalizable` into utils --- clippy_lints/src/transmute.rs | 11 ++++------- clippy_lints/src/utils/mod.rs | 9 +++++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/clippy_lints/src/transmute.rs b/clippy_lints/src/transmute.rs index 5bce733ab..b6ae611da 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::*; @@ -641,12 +643,7 @@ fn get_type_snippet(cx: &LateContext<'_, '_>, path: &QPath<'_>, to_ref_ty: Ty<'_ fn is_layout_incompatible<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, from: Ty<'tcx>, to: Ty<'tcx>) -> bool { let empty_param_env = ty::ParamEnv::empty(); // check if `from` and `to` are normalizable to avoid ICE (#4968) - let is_normalizable = cx.tcx.infer_ctxt().enter(|infcx| { - let cause = rustc::traits::ObligationCause::dummy(); - infcx.at(&cause, empty_param_env).normalize(&from).is_ok() - && infcx.at(&cause, empty_param_env).normalize(&to).is_ok() - }); - if !is_normalizable { + 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)); diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index ebfa88fab..0680f627b 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};