Skip to content

Commit 711c8cc

Browse files
saethlinsaethlin
committed
Remove polymorphization
1 parent 8dc8377 commit 711c8cc

File tree

92 files changed

+59
-2643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+59
-2643
lines changed

Diff for: ‎compiler/rustc_codegen_cranelift/build_system/tests.rs

-4
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ const BASE_SYSROOT_SUITE: &[TestCase] = &[
9292
TestCase::build_bin_and_run("aot.mod_bench", "example/mod_bench.rs", &[]),
9393
TestCase::build_bin_and_run("aot.issue-72793", "example/issue-72793.rs", &[]),
9494
TestCase::build_bin("aot.issue-59326", "example/issue-59326.rs"),
95-
TestCase::custom("aot.polymorphize_coroutine", &|runner| {
96-
runner.run_rustc(&["example/polymorphize_coroutine.rs", "-Zpolymorphize"]);
97-
runner.run_out_command("polymorphize_coroutine", &[]);
98-
}),
9995
TestCase::build_bin_and_run("aot.neon", "example/neon.rs", &[]),
10096
TestCase::custom("aot.gen_block_iterate", &|runner| {
10197
runner.run_rustc([

Diff for: ‎compiler/rustc_codegen_cranelift/config.txt

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ aot.float-minmax-pass
4242
aot.mod_bench
4343
aot.issue-72793
4444
aot.issue-59326
45-
aot.polymorphize_coroutine
4645
aot.neon
4746
aot.gen_block_iterate
4847
aot.raw-dylib

Diff for: ‎compiler/rustc_codegen_cranelift/example/polymorphize_coroutine.rs

-17
This file was deleted.

Diff for: ‎compiler/rustc_codegen_cranelift/src/abi/mod.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,7 @@ pub(crate) fn codegen_terminator_call<'tcx>(
394394
def_id,
395395
fn_args,
396396
source_info.span,
397-
)
398-
.polymorphize(fx.tcx);
397+
);
399398

400399
if is_call_from_compiler_builtins_to_upstream_monomorphization(fx.tcx, instance) {
401400
if target.is_some() {
@@ -698,7 +697,7 @@ pub(crate) fn codegen_drop<'tcx>(
698697
target: BasicBlock,
699698
) {
700699
let ty = drop_place.layout().ty;
701-
let drop_instance = Instance::resolve_drop_in_place(fx.tcx, ty).polymorphize(fx.tcx);
700+
let drop_instance = Instance::resolve_drop_in_place(fx.tcx, ty);
702701

703702
if let ty::InstanceKind::DropGlue(_, None) | ty::InstanceKind::AsyncDropGlueCtorShim(_, None) =
704703
drop_instance.def

Diff for: ‎compiler/rustc_codegen_cranelift/src/base.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -673,8 +673,7 @@ fn codegen_stmt<'tcx>(
673673
def_id,
674674
args,
675675
)
676-
.unwrap()
677-
.polymorphize(fx.tcx),
676+
.unwrap(),
678677
);
679678
let func_addr = fx.bcx.ins().func_addr(fx.pointer_type, func_ref);
680679
lval.write_cvalue(fx, CValue::by_val(func_addr, to_layout));
@@ -760,8 +759,7 @@ fn codegen_stmt<'tcx>(
760759
def_id,
761760
args,
762761
ty::ClosureKind::FnOnce,
763-
)
764-
.polymorphize(fx.tcx);
762+
);
765763
let func_ref = fx.get_function_ref(instance);
766764
let func_addr = fx.bcx.ins().func_addr(fx.pointer_type, func_ref);
767765
lval.write_cvalue(fx, CValue::by_val(func_addr, lval.layout()));
@@ -1087,7 +1085,7 @@ fn codegen_panic_inner<'tcx>(
10871085

10881086
let def_id = fx.tcx.require_lang_item(lang_item, span);
10891087

1090-
let instance = Instance::mono(fx.tcx, def_id).polymorphize(fx.tcx);
1088+
let instance = Instance::mono(fx.tcx, def_id);
10911089

10921090
if is_call_from_compiler_builtins_to_upstream_monomorphization(fx.tcx, instance) {
10931091
fx.bcx.ins().trap(TrapCode::user(2).unwrap());

Diff for: ‎compiler/rustc_codegen_cranelift/src/constant.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,7 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut dyn Module, cx: &mut Constant
452452
let data_id = match reloc_target_alloc {
453453
GlobalAlloc::Function { instance, .. } => {
454454
assert_eq!(addend, 0);
455-
let func_id =
456-
crate::abi::import_function(tcx, module, instance.polymorphize(tcx));
455+
let func_id = crate::abi::import_function(tcx, module, instance);
457456
let local_func_id = module.declare_func_in_data(func_id, &mut data);
458457
data.write_function_addr(offset.bytes() as u32, local_func_id);
459458
continue;

Diff for: ‎compiler/rustc_codegen_cranelift/src/main_shim.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub(crate) fn maybe_create_entry_wrapper(
2424
};
2525

2626
if main_def_id.is_local() {
27-
let instance = Instance::mono(tcx, main_def_id).polymorphize(tcx);
27+
let instance = Instance::mono(tcx, main_def_id);
2828
if module.get_name(tcx.symbol_name(instance).name).is_none() {
2929
return;
3030
}
@@ -75,7 +75,7 @@ pub(crate) fn maybe_create_entry_wrapper(
7575
}
7676
};
7777

78-
let instance = Instance::mono(tcx, rust_main_def_id).polymorphize(tcx);
78+
let instance = Instance::mono(tcx, rust_main_def_id);
7979

8080
let main_name = tcx.symbol_name(instance).name;
8181
let main_sig = get_function_sig(tcx, m.target_config().default_call_conv, instance);
@@ -117,8 +117,7 @@ pub(crate) fn maybe_create_entry_wrapper(
117117
report.def_id,
118118
tcx.mk_args(&[GenericArg::from(main_ret_ty)]),
119119
DUMMY_SP,
120-
)
121-
.polymorphize(tcx);
120+
);
122121

123122
let report_name = tcx.symbol_name(report).name;
124123
let report_sig = get_function_sig(tcx, m.target_config().default_call_conv, report);
@@ -143,8 +142,7 @@ pub(crate) fn maybe_create_entry_wrapper(
143142
start_def_id,
144143
tcx.mk_args(&[main_ret_ty.into()]),
145144
DUMMY_SP,
146-
)
147-
.polymorphize(tcx);
145+
);
148146
let start_func_id = import_function(tcx, m, start_instance);
149147

150148
let main_val = bcx.ins().func_addr(m.target_config().pointer_type(), main_func_ref);

Diff for: ‎compiler/rustc_codegen_cranelift/src/value_and_place.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1005,9 +1005,6 @@ pub(crate) fn assert_assignable<'tcx>(
10051005
}
10061006
}
10071007
}
1008-
(ty::Param(_), _) | (_, ty::Param(_)) if fx.tcx.sess.opts.unstable_opts.polymorphize => {
1009-
// No way to check if it is correct or not with polymorphization enabled
1010-
}
10111008
_ => {
10121009
assert_eq!(
10131010
from_ty,

Diff for: ‎compiler/rustc_codegen_gcc/tests/failing-ui-tests.txt

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ tests/ui/functions-closures/parallel-codegen-closures.rs
66
tests/ui/linkage-attr/linkage1.rs
77
tests/ui/lto/dylib-works.rs
88
tests/ui/numbers-arithmetic/saturating-float-casts.rs
9-
tests/ui/polymorphization/promoted-function.rs
109
tests/ui/sepcomp/sepcomp-cci.rs
1110
tests/ui/sepcomp/sepcomp-extern.rs
1211
tests/ui/sepcomp/sepcomp-fns-backwards.rs

Diff for: ‎compiler/rustc_codegen_llvm/src/common.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,9 @@ impl<'ll, 'tcx> ConstCodegenMethods<'tcx> for CodegenCx<'ll, 'tcx> {
302302
(value, AddressSpace::DATA)
303303
}
304304
}
305-
GlobalAlloc::Function { instance, .. } => (
306-
self.get_fn_addr(instance.polymorphize(self.tcx)),
307-
self.data_layout().instruction_address_space,
308-
),
305+
GlobalAlloc::Function { instance, .. } => {
306+
(self.get_fn_addr(instance), self.data_layout().instruction_address_space)
307+
}
309308
GlobalAlloc::VTable(ty, dyn_ty) => {
310309
let alloc = self
311310
.tcx

Diff for: ‎compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

-22
Original file line numberDiff line numberDiff line change
@@ -471,8 +471,6 @@ pub(crate) fn type_di_node<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, t: Ty<'tcx>) ->
471471
AdtKind::Enum => enums::build_enum_type_di_node(cx, unique_type_id),
472472
},
473473
ty::Tuple(_) => build_tuple_type_di_node(cx, unique_type_id),
474-
// Type parameters from polymorphized functions.
475-
ty::Param(_) => build_param_type_di_node(cx, t),
476474
_ => bug!("debuginfo: unexpected type in type_di_node(): {:?}", t),
477475
};
478476

@@ -871,26 +869,6 @@ fn build_foreign_type_di_node<'ll, 'tcx>(
871869
)
872870
}
873871

874-
fn build_param_type_di_node<'ll, 'tcx>(
875-
cx: &CodegenCx<'ll, 'tcx>,
876-
t: Ty<'tcx>,
877-
) -> DINodeCreationResult<'ll> {
878-
debug!("build_param_type_di_node: {:?}", t);
879-
let name = format!("{t:?}");
880-
DINodeCreationResult {
881-
di_node: unsafe {
882-
llvm::LLVMRustDIBuilderCreateBasicType(
883-
DIB(cx),
884-
name.as_c_char_ptr(),
885-
name.len(),
886-
Size::ZERO.bits(),
887-
DW_ATE_unsigned,
888-
)
889-
},
890-
already_stored_in_typemap: false,
891-
}
892-
}
893-
894872
pub(crate) fn build_compile_unit_di_node<'ll, 'tcx>(
895873
tcx: TyCtxt<'tcx>,
896874
codegen_unit_name: &str,

Diff for: ‎compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -432,11 +432,8 @@ fn push_debuginfo_type_name<'tcx>(
432432
push_closure_or_coroutine_name(tcx, def_id, args, qualified, output, visited);
433433
}
434434
}
435-
// Type parameters from polymorphized functions.
436-
ty::Param(_) => {
437-
write!(output, "{t:?}").unwrap();
438-
}
439-
ty::Error(_)
435+
ty::Param(_)
436+
| ty::Error(_)
440437
| ty::Infer(_)
441438
| ty::Placeholder(..)
442439
| ty::Alias(..)

Diff for: ‎compiler/rustc_codegen_ssa/src/mir/block.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -847,10 +847,13 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
847847

848848
let (instance, mut llfn) = match *callee.layout.ty.kind() {
849849
ty::FnDef(def_id, args) => (
850-
Some(
851-
ty::Instance::expect_resolve(bx.tcx(), bx.typing_env(), def_id, args, fn_span)
852-
.polymorphize(bx.tcx()),
853-
),
850+
Some(ty::Instance::expect_resolve(
851+
bx.tcx(),
852+
bx.typing_env(),
853+
def_id,
854+
args,
855+
fn_span,
856+
)),
854857
None,
855858
),
856859
ty::FnPtr(..) => (None, Some(callee.immediate())),

Diff for: ‎compiler/rustc_codegen_ssa/src/mir/rvalue.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
478478
def_id,
479479
args,
480480
)
481-
.unwrap()
482-
.polymorphize(bx.cx().tcx());
481+
.unwrap();
483482
OperandValue::Immediate(bx.get_fn_addr(instance))
484483
}
485484
_ => bug!("{} cannot be reified to a fn ptr", operand.layout.ty),
@@ -493,8 +492,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
493492
def_id,
494493
args,
495494
ty::ClosureKind::FnOnce,
496-
)
497-
.polymorphize(bx.cx().tcx());
495+
);
498496
OperandValue::Immediate(bx.cx().get_fn_addr(instance))
499497
}
500498
_ => bug!("{} cannot be cast to a fn ptr", operand.layout.ty),

Diff for: ‎compiler/rustc_const_eval/src/interpret/util.rs

+6-28
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ use crate::const_eval::{CompileTimeInterpCx, CompileTimeMachine, InterpretationR
1414

1515
/// Checks whether a type contains generic parameters which must be instantiated.
1616
///
17-
/// In case it does, returns a `TooGeneric` const eval error. Note that due to polymorphization
18-
/// types may be "concrete enough" even though they still contain generic parameters in
19-
/// case these parameters are unused.
20-
pub(crate) fn ensure_monomorphic_enough<'tcx, T>(tcx: TyCtxt<'tcx>, ty: T) -> InterpResult<'tcx>
17+
/// In case it does, returns a `TooGeneric` const eval error.
18+
pub(crate) fn ensure_monomorphic_enough<'tcx, T>(_tcx: TyCtxt<'tcx>, ty: T) -> InterpResult<'tcx>
2119
where
2220
T: TypeVisitable<TyCtxt<'tcx>>,
2321
{
@@ -27,11 +25,9 @@ where
2725
}
2826

2927
struct FoundParam;
30-
struct UsedParamsNeedInstantiationVisitor<'tcx> {
31-
tcx: TyCtxt<'tcx>,
32-
}
28+
struct UsedParamsNeedInstantiationVisitor {}
3329

34-
impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for UsedParamsNeedInstantiationVisitor<'tcx> {
30+
impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for UsedParamsNeedInstantiationVisitor {
3531
type Result = ControlFlow<FoundParam>;
3632

3733
fn visit_ty(&mut self, ty: Ty<'tcx>) -> Self::Result {
@@ -41,25 +37,7 @@ where
4137

4238
match *ty.kind() {
4339
ty::Param(_) => ControlFlow::Break(FoundParam),
44-
ty::Closure(def_id, args)
45-
| ty::CoroutineClosure(def_id, args, ..)
46-
| ty::Coroutine(def_id, args, ..)
47-
| ty::FnDef(def_id, args) => {
48-
let instance = ty::InstanceKind::Item(def_id);
49-
let unused_params = self.tcx.unused_generic_params(instance);
50-
for (index, arg) in args.into_iter().enumerate() {
51-
let index = index
52-
.try_into()
53-
.expect("more generic parameters than can fit into a `u32`");
54-
// Only recurse when generic parameters in fns, closures and coroutines
55-
// are used and have to be instantiated.
56-
//
57-
// Just in case there are closures or coroutines within this arg,
58-
// recurse.
59-
if unused_params.is_used(index) && arg.has_param() {
60-
return arg.visit_with(self);
61-
}
62-
}
40+
ty::Closure(..) | ty::CoroutineClosure(..) | ty::Coroutine(..) | ty::FnDef(..) => {
6341
ControlFlow::Continue(())
6442
}
6543
_ => ty.super_visit_with(self),
@@ -74,7 +52,7 @@ where
7452
}
7553
}
7654

77-
let mut vis = UsedParamsNeedInstantiationVisitor { tcx };
55+
let mut vis = UsedParamsNeedInstantiationVisitor {};
7856
if matches!(ty.visit_with(&mut vis), ControlFlow::Break(FoundParam)) {
7957
throw_inval!(TooGeneric);
8058
} else {

Diff for: ‎compiler/rustc_feature/src/builtin_attrs.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1103,10 +1103,6 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
11031103
TEST, rustc_symbol_name, Normal, template!(Word),
11041104
WarnFollowing, EncodeCrossCrate::No
11051105
),
1106-
rustc_attr!(
1107-
TEST, rustc_polymorphize_error, Normal, template!(Word),
1108-
WarnFollowing, EncodeCrossCrate::Yes
1109-
),
11101106
rustc_attr!(
11111107
TEST, rustc_def_path, Normal, template!(Word),
11121108
WarnFollowing, EncodeCrossCrate::No

Diff for: ‎compiler/rustc_interface/src/passes.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,6 @@ fn run_required_analyses(tcx: TyCtxt<'_>) {
876876
|| tcx.hir().body_const_context(def_id).is_some()
877877
{
878878
tcx.ensure().mir_drops_elaborated_and_const_checked(def_id);
879-
tcx.ensure().unused_generic_params(ty::InstanceKind::Item(def_id.to_def_id()));
880879
}
881880
}
882881
});
@@ -895,8 +894,7 @@ fn run_required_analyses(tcx: TyCtxt<'_>) {
895894
// If `-Zvalidate-mir` is set, we also want to compute the final MIR for each item
896895
// (either its `mir_for_ctfe` or `optimized_mir`) since that helps uncover any bugs
897896
// in MIR optimizations that may only be reachable through codegen, or other codepaths
898-
// that requires the optimized/ctfe MIR, such as polymorphization, coroutine bodies,
899-
// or evaluating consts.
897+
// that requires the optimized/ctfe MIR, coroutine bodies, or evaluating consts.
900898
if tcx.sess.opts.unstable_opts.validate_mir {
901899
sess.time("ensuring_final_MIR_is_computable", || {
902900
tcx.hir().par_body_owners(|def_id| {

Diff for: ‎compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ provide! { tcx, def_id, other, cdata,
269269
lookup_default_body_stability => { table }
270270
lookup_deprecation_entry => { table }
271271
params_in_repr => { table }
272-
unused_generic_params => { table_direct }
273272
def_kind => { cdata.def_kind(def_id.index) }
274273
impl_parent => { table }
275274
defaultness => { table_direct }

Diff for: ‎compiler/rustc_metadata/src/rmeta/encoder.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1767,10 +1767,6 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
17671767
{
17681768
record!(self.tables.mir_coroutine_witnesses[def_id.to_def_id()] <- witnesses);
17691769
}
1770-
1771-
let instance = ty::InstanceKind::Item(def_id.to_def_id());
1772-
let unused = tcx.unused_generic_params(instance);
1773-
self.tables.unused_generic_params.set(def_id.local_def_index, unused);
17741770
}
17751771

17761772
// Encode all the deduced parameter attributes for everything that has MIR, even for items

Diff for: ‎compiler/rustc_metadata/src/rmeta/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,6 @@ define_tables! {
395395
inherent_impls: Table<DefIndex, LazyArray<DefIndex>>,
396396
associated_types_for_impl_traits_in_associated_fn: Table<DefIndex, LazyArray<DefId>>,
397397
opt_rpitit_info: Table<DefIndex, Option<LazyValue<ty::ImplTraitInTraitData>>>,
398-
unused_generic_params: Table<DefIndex, UnusedGenericParams>,
399398
// Reexported names are not associated with individual `DefId`s,
400399
// e.g. a glob import can introduce a lot of names, all with the same `DefId`.
401400
// That's why the encoded list needs to contain `ModChild` structures describing all the names

Diff for: ‎compiler/rustc_middle/src/query/mod.rs

+1-10
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ use crate::ty::print::{PrintTraitRefExt, describe_as_module};
8282
use crate::ty::util::AlwaysRequiresDrop;
8383
use crate::ty::{
8484
self, CrateInherentImpls, GenericArg, GenericArgsRef, PseudoCanonicalInput, Ty, TyCtxt,
85-
TyCtxtFeed, UnusedGenericParams,
85+
TyCtxtFeed,
8686
};
8787
use crate::{dep_graph, mir, thir};
8888

@@ -2048,15 +2048,6 @@ rustc_queries! {
20482048
desc { "getting codegen unit `{sym}`" }
20492049
}
20502050

2051-
query unused_generic_params(key: ty::InstanceKind<'tcx>) -> UnusedGenericParams {
2052-
cache_on_disk_if { key.def_id().is_local() }
2053-
desc {
2054-
|tcx| "determining which generic parameters are unused by `{}`",
2055-
tcx.def_path_str(key.def_id())
2056-
}
2057-
separate_provide_extern
2058-
}
2059-
20602051
query backend_optimization_level(_: ()) -> OptLevel {
20612052
desc { "optimization level used by backend" }
20622053
}

0 commit comments

Comments
 (0)