Skip to content

Commit 6b1eab9

Browse files
CentrilCentril
authored
Rollup merge of rust-lang#64986 - skinny121:fn-ptr-const-generics, r=varkor
Function pointers as const generic arguments Makes function pointers as const generic arguments usable. Fixes rust-lang#62395 r? @varkor
2 parents c1ef7d5 + 5986fe2 commit 6b1eab9

16 files changed

+380
-151
lines changed

‎src/librustc/mir/interpret/mod.rs

+8
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,14 @@ impl<'tcx> AllocMap<'tcx> {
470470
}
471471
}
472472

473+
/// Panics if the `AllocId` does not refer to a function
474+
pub fn unwrap_fn(&self, id: AllocId) -> Instance<'tcx> {
475+
match self.get(id) {
476+
Some(GlobalAlloc::Function(instance)) => instance,
477+
_ => bug!("expected allocation ID {} to point to a function", id),
478+
}
479+
}
480+
473481
/// Freezes an `AllocId` created with `reserve` by pointing it at an `Allocation`. Trying to
474482
/// call this function twice, even with the same `Allocation` will ICE the compiler.
475483
pub fn set_alloc_id_memory(&mut self, id: AllocId, mem: &'tcx Allocation) {

‎src/librustc/ty/print/pretty.rs

+106-111
Original file line numberDiff line numberDiff line change
@@ -863,125 +863,120 @@ pub trait PrettyPrinter<'tcx>:
863863
}
864864

865865
let u8 = self.tcx().types.u8;
866-
if let ty::FnDef(did, substs) = ct.ty.kind {
867-
p!(print_value_path(did, substs));
868-
return Ok(self);
869-
}
870-
if let ConstValue::Unevaluated(did, substs) = ct.val {
871-
match self.tcx().def_kind(did) {
872-
| Some(DefKind::Static)
873-
| Some(DefKind::Const)
874-
| Some(DefKind::AssocConst) => p!(print_value_path(did, substs)),
875-
_ => if did.is_local() {
876-
let span = self.tcx().def_span(did);
877-
if let Ok(snip) = self.tcx().sess.source_map().span_to_snippet(span) {
878-
p!(write("{}", snip))
866+
867+
match (ct.val, &ct.ty.kind) {
868+
(_, ty::FnDef(did, substs)) => p!(print_value_path(*did, substs)),
869+
(ConstValue::Unevaluated(did, substs), _) => {
870+
match self.tcx().def_kind(did) {
871+
| Some(DefKind::Static)
872+
| Some(DefKind::Const)
873+
| Some(DefKind::AssocConst) => p!(print_value_path(did, substs)),
874+
_ => if did.is_local() {
875+
let span = self.tcx().def_span(did);
876+
if let Ok(snip) = self.tcx().sess.source_map().span_to_snippet(span) {
877+
p!(write("{}", snip))
878+
} else {
879+
p!(write("_: "), print(ct.ty))
880+
}
879881
} else {
880882
p!(write("_: "), print(ct.ty))
881-
}
883+
},
884+
}
885+
},
886+
(ConstValue::Infer(..), _) => p!(write("_: "), print(ct.ty)),
887+
(ConstValue::Param(ParamConst { name, .. }), _) => p!(write("{}", name)),
888+
(ConstValue::Scalar(Scalar::Raw { data, .. }), ty::Bool) =>
889+
p!(write("{}", if data == 0 { "false" } else { "true" })),
890+
(ConstValue::Scalar(Scalar::Raw { data, .. }), ty::Float(ast::FloatTy::F32)) =>
891+
p!(write("{}f32", Single::from_bits(data))),
892+
(ConstValue::Scalar(Scalar::Raw { data, .. }), ty::Float(ast::FloatTy::F64)) =>
893+
p!(write("{}f64", Double::from_bits(data))),
894+
(ConstValue::Scalar(Scalar::Raw { data, .. }), ty::Uint(ui)) => {
895+
let bit_size = Integer::from_attr(&self.tcx(), UnsignedInt(*ui)).size();
896+
let max = truncate(u128::max_value(), bit_size);
897+
898+
if data == max {
899+
p!(write("std::{}::MAX", ui))
882900
} else {
883-
p!(write("_: "), print(ct.ty))
884-
},
885-
}
886-
return Ok(self);
887-
}
888-
if let ConstValue::Infer(..) = ct.val {
889-
p!(write("_: "), print(ct.ty));
890-
return Ok(self);
891-
}
892-
if let ConstValue::Param(ParamConst { name, .. }) = ct.val {
893-
p!(write("{}", name));
894-
return Ok(self);
895-
}
896-
if let ConstValue::Scalar(Scalar::Raw { data, .. }) = ct.val {
897-
match ct.ty.kind {
898-
ty::Bool => {
899-
p!(write("{}", if data == 0 { "false" } else { "true" }));
900-
return Ok(self);
901-
},
902-
ty::Float(ast::FloatTy::F32) => {
903-
p!(write("{}f32", Single::from_bits(data)));
904-
return Ok(self);
905-
},
906-
ty::Float(ast::FloatTy::F64) => {
907-
p!(write("{}f64", Double::from_bits(data)));
908-
return Ok(self);
909-
},
910-
ty::Uint(ui) => {
911-
let bit_size = Integer::from_attr(&self.tcx(), UnsignedInt(ui)).size();
912-
let max = truncate(u128::max_value(), bit_size);
901+
p!(write("{}{}", data, ui))
902+
};
903+
},
904+
(ConstValue::Scalar(Scalar::Raw { data, .. }), ty::Int(i)) => {
905+
let bit_size = Integer::from_attr(&self.tcx(), SignedInt(*i))
906+
.size().bits() as u128;
907+
let min = 1u128 << (bit_size - 1);
908+
let max = min - 1;
909+
910+
let ty = self.tcx().lift(&ct.ty).unwrap();
911+
let size = self.tcx().layout_of(ty::ParamEnv::empty().and(ty))
912+
.unwrap()
913+
.size;
914+
match data {
915+
d if d == min => p!(write("std::{}::MIN", i)),
916+
d if d == max => p!(write("std::{}::MAX", i)),
917+
_ => p!(write("{}{}", sign_extend(data, size) as i128, i))
918+
}
919+
},
920+
(ConstValue::Scalar(Scalar::Raw { data, .. }), ty::Char) =>
921+
p!(write("{:?}", ::std::char::from_u32(data as u32).unwrap())),
922+
(ConstValue::Scalar(Scalar::Ptr(ptr)), ty::FnPtr(_)) => {
923+
let instance = {
924+
let alloc_map = self.tcx().alloc_map.lock();
925+
alloc_map.unwrap_fn(ptr.alloc_id)
926+
};
927+
p!(print_value_path(instance.def_id(), instance.substs));
928+
},
929+
_ => {
930+
let printed = if let ty::Ref(_, ref_ty, _) = ct.ty.kind {
931+
let byte_str = match (ct.val, &ref_ty.kind) {
932+
(ConstValue::Scalar(Scalar::Ptr(ptr)), ty::Array(t, n)) if *t == u8 => {
933+
let n = n.eval_usize(self.tcx(), ty::ParamEnv::empty());
934+
Some(self.tcx()
935+
.alloc_map.lock()
936+
.unwrap_memory(ptr.alloc_id)
937+
.get_bytes(&self.tcx(), ptr, Size::from_bytes(n)).unwrap())
938+
},
939+
(ConstValue::Slice { data, start, end }, ty::Slice(t)) if *t == u8 => {
940+
// The `inspect` here is okay since we checked the bounds, and there are
941+
// no relocations (we have an active slice reference here). We don't use
942+
// this result to affect interpreter execution.
943+
Some(data.inspect_with_undef_and_ptr_outside_interpreter(start..end))
944+
},
945+
_ => None,
946+
};
913947

914-
if data == max {
915-
p!(write("std::{}::MAX", ui))
948+
if let Some(byte_str) = byte_str {
949+
p!(write("b\""));
950+
for &c in byte_str {
951+
for e in std::ascii::escape_default(c) {
952+
self.write_char(e as char)?;
953+
}
954+
}
955+
p!(write("\""));
956+
true
957+
} else if let (ConstValue::Slice { data, start, end }, ty::Str) =
958+
(ct.val, &ref_ty.kind)
959+
{
960+
// The `inspect` here is okay since we checked the bounds, and there are no
961+
// relocations (we have an active `str` reference here). We don't use this
962+
// result to affect interpreter execution.
963+
let slice = data.inspect_with_undef_and_ptr_outside_interpreter(start..end);
964+
let s = ::std::str::from_utf8(slice)
965+
.expect("non utf8 str from miri");
966+
p!(write("{:?}", s));
967+
true
916968
} else {
917-
p!(write("{}{}", data, ui))
918-
};
919-
return Ok(self);
920-
},
921-
ty::Int(i) =>{
922-
let bit_size = Integer::from_attr(&self.tcx(), SignedInt(i))
923-
.size().bits() as u128;
924-
let min = 1u128 << (bit_size - 1);
925-
let max = min - 1;
926-
927-
let ty = self.tcx().lift(&ct.ty).unwrap();
928-
let size = self.tcx().layout_of(ty::ParamEnv::empty().and(ty))
929-
.unwrap()
930-
.size;
931-
match data {
932-
d if d == min => p!(write("std::{}::MIN", i)),
933-
d if d == max => p!(write("std::{}::MAX", i)),
934-
_ => p!(write("{}{}", sign_extend(data, size) as i128, i))
935-
}
936-
return Ok(self);
937-
},
938-
ty::Char => {
939-
p!(write("{:?}", ::std::char::from_u32(data as u32).unwrap()));
940-
return Ok(self);
941-
}
942-
_ => {},
943-
}
944-
}
945-
if let ty::Ref(_, ref_ty, _) = ct.ty.kind {
946-
let byte_str = match (ct.val, &ref_ty.kind) {
947-
(ConstValue::Scalar(Scalar::Ptr(ptr)), ty::Array(t, n)) if *t == u8 => {
948-
let n = n.eval_usize(self.tcx(), ty::ParamEnv::empty());
949-
Some(self.tcx()
950-
.alloc_map.lock()
951-
.unwrap_memory(ptr.alloc_id)
952-
.get_bytes(&self.tcx(), ptr, Size::from_bytes(n)).unwrap())
953-
},
954-
(ConstValue::Slice { data, start, end }, ty::Slice(t)) if *t == u8 => {
955-
// The `inspect` here is okay since we checked the bounds, and there are no
956-
// relocations (we have an active slice reference here). We don't use this
957-
// result to affect interpreter execution.
958-
Some(data.inspect_with_undef_and_ptr_outside_interpreter(start..end))
959-
},
960-
(ConstValue::Slice { data, start, end }, ty::Str) => {
961-
// The `inspect` here is okay since we checked the bounds, and there are no
962-
// relocations (we have an active `str` reference here). We don't use this
963-
// result to affect interpreter execution.
964-
let slice = data.inspect_with_undef_and_ptr_outside_interpreter(start..end);
965-
let s = ::std::str::from_utf8(slice)
966-
.expect("non utf8 str from miri");
967-
p!(write("{:?}", s));
968-
return Ok(self);
969-
},
970-
_ => None,
971-
};
972-
if let Some(byte_str) = byte_str {
973-
p!(write("b\""));
974-
for &c in byte_str {
975-
for e in std::ascii::escape_default(c) {
976-
self.write_char(e as char)?;
969+
false
977970
}
971+
} else {
972+
false
973+
};
974+
if !printed {
975+
// fallback
976+
p!(write("{:?} : ", ct.val), print(ct.ty))
978977
}
979-
p!(write("\""));
980-
return Ok(self);
981978
}
982-
}
983-
p!(write("{:?} : ", ct.val), print(ct.ty));
984-
979+
};
985980
Ok(self)
986981
}
987982
}

‎src/librustc/ty/relate.rs

+30-28
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::hir::def_id::DefId;
88
use crate::ty::subst::{GenericArg, GenericArgKind, SubstsRef};
99
use crate::ty::{self, Ty, TyCtxt, TypeFoldable};
1010
use crate::ty::error::{ExpectedFound, TypeError};
11-
use crate::mir::interpret::{ConstValue, get_slice_bytes, Scalar};
11+
use crate::mir::interpret::{ConstValue, get_slice_bytes};
1212
use std::rc::Rc;
1313
use std::iter;
1414
use rustc_target::spec::abi;
@@ -561,37 +561,39 @@ pub fn super_relate_consts<R: TypeRelation<'tcx>>(
561561
// implement both `PartialEq` and `Eq`, corresponding to
562562
// `structural_match` types.
563563
// FIXME(const_generics): check for `structural_match` synthetic attribute.
564-
match (eagerly_eval(a), eagerly_eval(b)) {
564+
let new_const_val = match (eagerly_eval(a), eagerly_eval(b)) {
565565
(ConstValue::Infer(_), _) | (_, ConstValue::Infer(_)) => {
566566
// The caller should handle these cases!
567567
bug!("var types encountered in super_relate_consts: {:?} {:?}", a, b)
568568
}
569569
(ConstValue::Param(a_p), ConstValue::Param(b_p)) if a_p.index == b_p.index => {
570-
Ok(a)
570+
return Ok(a);
571571
}
572572
(ConstValue::Placeholder(p1), ConstValue::Placeholder(p2)) if p1 == p2 => {
573-
Ok(a)
573+
return Ok(a);
574574
}
575-
(a_val @ ConstValue::Scalar(Scalar::Raw { .. }), b_val @ _)
576-
if a.ty == b.ty && a_val == b_val =>
577-
{
578-
Ok(tcx.mk_const(ty::Const {
579-
val: a_val,
580-
ty: a.ty,
581-
}))
575+
(ConstValue::Scalar(a_val), ConstValue::Scalar(b_val)) if a.ty == b.ty => {
576+
if a_val == b_val {
577+
Ok(ConstValue::Scalar(a_val))
578+
} else if let ty::FnPtr(_) = a.ty.kind {
579+
let alloc_map = tcx.alloc_map.lock();
580+
let a_instance = alloc_map.unwrap_fn(a_val.to_ptr().unwrap().alloc_id);
581+
let b_instance = alloc_map.unwrap_fn(b_val.to_ptr().unwrap().alloc_id);
582+
if a_instance == b_instance {
583+
Ok(ConstValue::Scalar(a_val))
584+
} else {
585+
Err(TypeError::ConstMismatch(expected_found(relation, &a, &b)))
586+
}
587+
} else {
588+
Err(TypeError::ConstMismatch(expected_found(relation, &a, &b)))
589+
}
582590
}
583591

584-
// FIXME(const_generics): we should either handle `Scalar::Ptr` or add a comment
585-
// saying that we're not handling it intentionally.
586-
587592
(a_val @ ConstValue::Slice { .. }, b_val @ ConstValue::Slice { .. }) => {
588593
let a_bytes = get_slice_bytes(&tcx, a_val);
589594
let b_bytes = get_slice_bytes(&tcx, b_val);
590595
if a_bytes == b_bytes {
591-
Ok(tcx.mk_const(ty::Const {
592-
val: a_val,
593-
ty: a.ty,
594-
}))
596+
Ok(a_val)
595597
} else {
596598
Err(TypeError::ConstMismatch(expected_found(relation, &a, &b)))
597599
}
@@ -602,16 +604,16 @@ pub fn super_relate_consts<R: TypeRelation<'tcx>>(
602604
// FIXME(const_generics): this is wrong, as it is a projection
603605
(ConstValue::Unevaluated(a_def_id, a_substs),
604606
ConstValue::Unevaluated(b_def_id, b_substs)) if a_def_id == b_def_id => {
605-
let substs =
606-
relation.relate_with_variance(ty::Variance::Invariant, &a_substs, &b_substs)?;
607-
Ok(tcx.mk_const(ty::Const {
608-
val: ConstValue::Unevaluated(a_def_id, &substs),
609-
ty: a.ty,
610-
}))
611-
}
612-
613-
_ => Err(TypeError::ConstMismatch(expected_found(relation, &a, &b))),
614-
}
607+
let substs =
608+
relation.relate_with_variance(ty::Variance::Invariant, &a_substs, &b_substs)?;
609+
Ok(ConstValue::Unevaluated(a_def_id, &substs))
610+
}
611+
_ => Err(TypeError::ConstMismatch(expected_found(relation, &a, &b))),
612+
};
613+
new_const_val.map(|val| tcx.mk_const(ty::Const {
614+
val,
615+
ty: a.ty,
616+
}))
615617
}
616618

617619
impl<'tcx> Relate<'tcx> for &'tcx ty::List<ty::ExistentialPredicate<'tcx>> {

‎src/librustc_mir/monomorphize/collector.rs

+9-8
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,14 @@ fn collect_const<'tcx>(
12651265
) {
12661266
debug!("visiting const {:?}", constant);
12671267

1268-
match constant.val {
1268+
let param_env = ty::ParamEnv::reveal_all();
1269+
let substituted_constant = tcx.subst_and_normalize_erasing_regions(
1270+
param_substs,
1271+
param_env,
1272+
&constant,
1273+
);
1274+
1275+
match substituted_constant.val {
12691276
ConstValue::Scalar(Scalar::Ptr(ptr)) =>
12701277
collect_miri(tcx, ptr.alloc_id, output),
12711278
ConstValue::Slice { data: alloc, start: _, end: _ } |
@@ -1275,12 +1282,6 @@ fn collect_const<'tcx>(
12751282
}
12761283
}
12771284
ConstValue::Unevaluated(def_id, substs) => {
1278-
let param_env = ty::ParamEnv::reveal_all();
1279-
let substs = tcx.subst_and_normalize_erasing_regions(
1280-
param_substs,
1281-
param_env,
1282-
&substs,
1283-
);
12841285
let instance = ty::Instance::resolve(tcx,
12851286
param_env,
12861287
def_id,
@@ -1297,7 +1298,7 @@ fn collect_const<'tcx>(
12971298
tcx.def_span(def_id), "collection encountered polymorphic constant",
12981299
),
12991300
}
1300-
}
1301+
},
13011302
_ => {},
13021303
}
13031304
}

0 commit comments

Comments
 (0)