bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Do not merge fn pointer casts.

Browse source
This commit is contained in:
Camille GILLOT 2023-10-21 09:59:03 +00:00
parent ac0228da59
commit c4cc9ca060
5 changed files with 272 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_mir_transform/src/gvn.rs
View file

@ -92,6 +92,7 @@ use rustc_index::IndexVec;
use rustc_macros::newtype_index;
use rustc_middle::mir::visit::*;
use rustc_middle::mir::*;
use rustc_middle::ty::adjustment::PointerCoercion;
use rustc_middle::ty::layout::LayoutOf;
use rustc_middle::ty::{self, Ty, TyCtxt, TypeAndMut};
use rustc_span::def_id::DefId;
@ -761,6 +762,14 @@ impl<'body, 'tcx> VnState<'body, 'tcx> {
Rvalue::Cast(kind, ref mut value, to) => {
let from = value.ty(self.local_decls, self.tcx);
let value = self.simplify_operand(value, location)?;
if let CastKind::PointerCoercion(
PointerCoercion::ReifyFnPointer | PointerCoercion::ClosureFnPointer(_),
) = kind
{
// Each reification of a generic fn may get a different pointer.
// Do not try to merge them.
return self.new_opaque();
}
Value::Cast { kind, value, from, to }
}
Rvalue::BinaryOp(op, box (ref mut lhs, ref mut rhs)) => {