use middle::cstore::{NativeLibraryKind, LinkMeta, LinkagePreference};
use middle::def;
use middle::lang_items;
-use middle::ty::{self, Ty};
+use middle::ty::{self, Ty, VariantKind};
use middle::def_id::{DefId, DefIndex};
use rustc::front::map as hir_map;
use rustc::mir::repr::Mir;
+use rustc::mir::mir_map::MirMap;
use rustc::util::nodemap::{FnvHashMap, NodeMap, NodeSet};
use std::cell::RefCell;
decoder::is_default_impl(&*cdata, impl_did.index)
}
- fn is_extern_fn(&self, tcx: &ty::ctxt<'tcx>, did: DefId) -> bool
- {
+ fn is_extern_item(&self, tcx: &ty::ctxt<'tcx>, did: DefId) -> bool {
let cdata = self.get_crate_data(did.krate);
- decoder::is_extern_fn(&*cdata, did.index, tcx)
- }
-
- fn is_static(&self, did: DefId) -> bool
- {
- let cdata = self.get_crate_data(did.krate);
- decoder::is_static(&*cdata, did.index)
+ decoder::is_extern_item(&*cdata, did.index, tcx)
}
fn is_static_method(&self, def: DefId) -> bool
local_path.into_iter().chain(path).collect()
}
+ fn variant_kind(&self, def_id: DefId) -> Option<VariantKind> {
+ let cdata = self.get_crate_data(def_id.krate);
+ decoder::get_variant_kind(&cdata, def_id.index)
+ }
+
+ fn struct_ctor_def_id(&self, struct_def_id: DefId) -> Option<DefId>
+ {
+ let cdata = self.get_crate_data(struct_def_id.krate);
+ decoder::get_struct_ctor_def_id(&cdata, struct_def_id.index)
+ }
+
fn tuple_struct_definition_if_ctor(&self, did: DefId) -> Option<DefId>
{
let cdata = self.get_crate_data(did.krate);
decoder::maybe_get_item_mir(&*cdata, tcx, def.index)
}
+ fn is_item_mir_available(&self, def: DefId) -> bool {
+ let cdata = self.get_crate_data(def.krate);
+ decoder::is_item_mir_available(&*cdata, def.index)
+ }
+
fn crates(&self) -> Vec<ast::CrateNum>
{
let mut result = vec![];
item_symbols: &RefCell<NodeMap<String>>,
link_meta: &LinkMeta,
reachable: &NodeSet,
- mir_map: &NodeMap<Mir<'tcx>>,
+ mir_map: &MirMap<'tcx>,
krate: &hir::Crate) -> Vec<u8>
{
let encode_inlined_item: encoder::EncodeInlinedItem =