bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Divide up metadata into separate DepNodes

Browse source
This commit is contained in:
Taylor Cramer 2017-06-15 22:25:41 -07:00
parent c98ca953b0
commit e6dd869260
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc/dep_graph/dep_node.rs
View file

@ -80,7 +80,7 @@ macro_rules! define_dep_nodes {
($( ($(
$variant:ident $(( $($tuple_arg:tt),* ))* $variant:ident $(( $($tuple_arg:tt),* ))*
$({ $($struct_arg_name:ident : $struct_arg_ty:ty),* })* $({ $($struct_arg_name:ident : $struct_arg_ty:ty),* })*
),* ,)*
) => ( ) => (
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash,
RustcEncodable, RustcDecodable)] RustcEncodable, RustcDecodable)]
@ -421,7 +421,11 @@ define_dep_nodes!(
IsExportedSymbol(DefId), IsExportedSymbol(DefId),
IsMirAvailable(DefId), IsMirAvailable(DefId),
ItemAttrs(DefId), ItemAttrs(DefId),
FnArgNames(DefId) FnArgNames(DefId),
DylibDepFormats(DefId),
IsAllocator(DefId),
IsPanicRuntime(DefId),
ExternCrate(DefId),
); );
trait DepNodeParams<'a, 'gcx: 'tcx + 'a, 'tcx: 'a> { trait DepNodeParams<'a, 'gcx: 'tcx + 'a, 'tcx: 'a> {

8
src/librustc/ty/maps.rs
View file

@ -964,13 +964,13 @@ define_maps! { <'tcx>
[] layout_raw: layout_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>) [] layout_raw: layout_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>)
-> Result<&'tcx Layout, LayoutError<'tcx>>, -> Result<&'tcx Layout, LayoutError<'tcx>>,
[] dylib_dependency_formats: MetaData(DefId) [] dylib_dependency_formats: DylibDepFormats(DefId)
-> Rc<Vec<(CrateNum, LinkagePreference)>>, -> Rc<Vec<(CrateNum, LinkagePreference)>>,
[] is_allocator: MetaData(DefId) -> bool, [] is_allocator: IsAllocator(DefId) -> bool,
[] is_panic_runtime: MetaData(DefId) -> bool, [] is_panic_runtime: IsPanicRuntime(DefId) -> bool,
[] extern_crate: MetaData(DefId) -> Rc<Option<ExternCrate>>, [] extern_crate: ExternCrate(DefId) -> Rc<Option<ExternCrate>>,
} }
fn type_param_predicates((item_id, param_id): (DefId, DefId)) -> DepConstructor { fn type_param_predicates((item_id, param_id): (DefId, DefId)) -> DepConstructor {