Skip to content

Commit dbf8ac9

Browse files
committed
Introduce small cache to avoid recomputing the same value twice
1 parent 1c14404 commit dbf8ac9

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

compiler/rustc_lint/src/reference_casting.rs

+14-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,15 @@ impl<'tcx> LateLintPass<'tcx> for InvalidReferenceCasting {
4242
let init = cx.expr_or_init(e);
4343
let orig_cast = if init.span != e.span { Some(init.span) } else { None };
4444

45+
// small cache to avoid recomputing needlesly computing peel_casts of init
46+
let mut peel_casts = {
47+
let mut peel_casts_cache = None;
48+
move || *peel_casts_cache.get_or_insert_with(|| peel_casts(cx, init))
49+
};
50+
4551
if matches!(pat, PatternKind::Borrow { mutbl: Mutability::Mut } | PatternKind::Assign)
46-
&& let Some(ty_has_interior_mutability) = is_cast_from_ref_to_mut_ptr(cx, init)
52+
&& let Some(ty_has_interior_mutability) =
53+
is_cast_from_ref_to_mut_ptr(cx, init, &mut peel_casts)
4754
{
4855
let ty_has_interior_mutability = ty_has_interior_mutability.then_some(());
4956

@@ -64,7 +71,8 @@ impl<'tcx> LateLintPass<'tcx> for InvalidReferenceCasting {
6471
);
6572
}
6673

67-
if let Some((from_ty_layout, to_ty_layout)) = is_cast_to_bigger_memory_layout(cx, init)
74+
if let Some((from_ty_layout, to_ty_layout)) =
75+
is_cast_to_bigger_memory_layout(cx, init, &mut peel_casts)
6876
{
6977
cx.emit_spanned_lint(
7078
INVALID_REFERENCE_CASTING,
@@ -141,6 +149,7 @@ fn borrow_or_assign<'tcx>(
141149
fn is_cast_from_ref_to_mut_ptr<'tcx>(
142150
cx: &LateContext<'tcx>,
143151
orig_expr: &'tcx Expr<'tcx>,
152+
mut peel_casts: impl FnMut() -> (&'tcx Expr<'tcx>, bool),
144153
) -> Option<bool> {
145154
let end_ty = cx.typeck_results().node_type(orig_expr.hir_id);
146155

@@ -149,7 +158,7 @@ fn is_cast_from_ref_to_mut_ptr<'tcx>(
149158
return None;
150159
}
151160

152-
let (e, need_check_freeze) = peel_casts(cx, orig_expr);
161+
let (e, need_check_freeze) = peel_casts();
153162

154163
let start_ty = cx.typeck_results().node_type(e.hir_id);
155164
if let ty::Ref(_, inner_ty, Mutability::Not) = start_ty.kind() {
@@ -171,14 +180,15 @@ fn is_cast_from_ref_to_mut_ptr<'tcx>(
171180
fn is_cast_to_bigger_memory_layout<'tcx>(
172181
cx: &LateContext<'tcx>,
173182
orig_expr: &'tcx Expr<'tcx>,
183+
mut peel_casts: impl FnMut() -> (&'tcx Expr<'tcx>, bool),
174184
) -> Option<(TyAndLayout<'tcx>, TyAndLayout<'tcx>)> {
175185
let end_ty = cx.typeck_results().node_type(orig_expr.hir_id);
176186

177187
let ty::RawPtr(TypeAndMut { ty: inner_end_ty, mutbl: _ }) = end_ty.kind() else {
178188
return None;
179189
};
180190

181-
let (e, _) = peel_casts(cx, orig_expr);
191+
let (e, _) = peel_casts();
182192
let start_ty = cx.typeck_results().node_type(e.hir_id);
183193

184194
let ty::Ref(_, inner_start_ty, _) = start_ty.kind() else {

0 commit comments

Comments
 (0)