Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Polymorphization #69749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jul 21, 2020
Merged

Polymorphization #69749

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
996bc9a
mir: avoid double substitution
davidtwco Jun 22, 2020
576deef
mir: rename `should_monomorphize_locally`
davidtwco Jun 22, 2020
c6ed442
ty: `STILL_FURTHER_SPECIALIZABLE` w/out prnt subst
davidtwco Jun 22, 2020
ce7c48f
trait_sel: only test predicates w/ no substs
davidtwco Jun 22, 2020
842fa0c
ty: add doc comments to `Generics` methods
davidtwco Jun 22, 2020
5bf2c7d
debuginfo: no type metadata if substs reqd
davidtwco Jun 22, 2020
19e8495
debuginfo: add type metadata for params
davidtwco Jun 22, 2020
47756bb
shim: adjust valid shim asserts
davidtwco Jun 22, 2020
2989fea
mir: `unused_generic_params` query
davidtwco Jun 22, 2020
f52c729
ty: normalize fn sigs before subst
davidtwco Jun 22, 2020
5ce29d3
metadata: record `unused_generic_params`
davidtwco Jun 22, 2020
b1f8bd6
mir: use attribute over `-Z polymorphize-errors`
davidtwco Jul 16, 2020
4b99699
index: introduce and use `FiniteBitSet`
davidtwco Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
debuginfo: add type metadata for params 
This commit adds type metadata for generic parameters (that arise from
polymorphization). Generic parameter metadata is considered zero-sized
and named after the generic parameter.

Signed-off-by: David Wood <[email protected]>
  • Loading branch information
@davidtwco
davidtwco committed Jul 20, 2020
commit 19e849516e19fcb0a16be7d3e329c1bbb1746fa3
16 changes: 16 additions & 0 deletions src/librustc_codegen_llvm/debuginfo/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,8 @@ pub fn type_metadata(cx: &CodegenCx<'ll, 'tcx>, t: Ty<'tcx>, usage_site_span: Sp
prepare_tuple_metadata(cx, t, &tys, unique_type_id, usage_site_span, NO_SCOPE_METADATA)
.finalize(cx)
}
// Type parameters from polymorphized functions.
ty::Param(_) => MetadataCreationResult::new(param_type_metadata(cx, t), false),
_ => bug!("debuginfo: unexpected type in type_metadata: {:?}", t),
};

Expand Down Expand Up @@ -955,6 +957,20 @@ fn pointer_type_metadata(
}
}

fn param_type_metadata(cx: &CodegenCx<'ll, 'tcx>, t: Ty<'tcx>) -> &'ll DIType {
debug!("param_type_metadata: {:?}", t);
let name = format!("{:?}", t);
return unsafe {
llvm::LLVMRustDIBuilderCreateBasicType(
DIB(cx),
name.as_ptr().cast(),
name.len(),
Size::ZERO.bits(),
DW_ATE_unsigned,
)
};
}

pub fn compile_unit_metadata(
tcx: TyCtxt<'_>,
codegen_unit_name: &str,
Expand Down
7 changes: 5 additions & 2 deletions src/librustc_codegen_ssa/debuginfo/type_names.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,17 @@ pub fn push_debuginfo_type_name<'tcx>(
tcx.def_key(def_id).disambiguated_data.disambiguator
));
}
// Type parameters from polymorphized functions.
ty::Param(_) => {
output.push_str(&format!("{:?}", t));
}
ty::Error(_)
| ty::Infer(_)
| ty::Placeholder(..)
| ty::Projection(..)
| ty::Bound(..)
| ty::Opaque(..)
| ty::GeneratorWitness(..)
| ty::Param(_) => {
| ty::GeneratorWitness(..) => {
bug!(
"debuginfo: Trying to create type name for \
unexpected type: {:?}",
Expand Down