diff options
| author | Taylor Cramer <cramertj@google.com> | 2017-06-15 22:25:41 -0700 |
|---|---|---|
| committer | Taylor Cramer <cramertj@google.com> | 2017-06-15 22:25:41 -0700 |
| commit | e6dd8692606fc966dac7315c56e9a24932bb951c (patch) | |
| tree | 29acabbf34f8559baa6d5ff1877e8e55e77a331b | |
| parent | c98ca953b07c2afb8dd7ceab1215249e94c3025d (diff) | |
| download | rust-e6dd8692606fc966dac7315c56e9a24932bb951c.tar.gz rust-e6dd8692606fc966dac7315c56e9a24932bb951c.zip | |
Divide up metadata into separate DepNodes
| -rw-r--r-- | src/librustc/dep_graph/dep_node.rs | 8 | ||||
| -rw-r--r-- | src/librustc/ty/maps.rs | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/librustc/dep_graph/dep_node.rs b/src/librustc/dep_graph/dep_node.rs index c987a37c420..a2ff009a55d 100644 --- a/src/librustc/dep_graph/dep_node.rs +++ b/src/librustc/dep_graph/dep_node.rs @@ -80,7 +80,7 @@ macro_rules! define_dep_nodes { ($( $variant:ident $(( $($tuple_arg:tt),* ))* $({ $($struct_arg_name:ident : $struct_arg_ty:ty),* })* - ),* + ,)* ) => ( #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, RustcEncodable, RustcDecodable)] @@ -421,7 +421,11 @@ define_dep_nodes!( IsExportedSymbol(DefId), IsMirAvailable(DefId), ItemAttrs(DefId), - FnArgNames(DefId) + FnArgNames(DefId), + DylibDepFormats(DefId), + IsAllocator(DefId), + IsPanicRuntime(DefId), + ExternCrate(DefId), ); trait DepNodeParams<'a, 'gcx: 'tcx + 'a, 'tcx: 'a> { diff --git a/src/librustc/ty/maps.rs b/src/librustc/ty/maps.rs index dccc0a8283a..524cf57472b 100644 --- a/src/librustc/ty/maps.rs +++ b/src/librustc/ty/maps.rs @@ -964,13 +964,13 @@ define_maps! { <'tcx> [] layout_raw: layout_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> Result<&'tcx Layout, LayoutError<'tcx>>, - [] dylib_dependency_formats: MetaData(DefId) + [] dylib_dependency_formats: DylibDepFormats(DefId) -> Rc<Vec<(CrateNum, LinkagePreference)>>, - [] is_allocator: MetaData(DefId) -> bool, - [] is_panic_runtime: MetaData(DefId) -> bool, + [] is_allocator: IsAllocator(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 { |