mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check that trait_map is not moved twice.

Browse Source
This commit is contained in:
Camille GILLOT 2021-05-29 22:56:23 +02:00
parent 273778086c
commit c11691b460
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_resolve/src/lib.rs
View File

@ -910,6 +910,8 @@ pub struct Resolver<'a> {
extern_crate_map: FxHashMap<LocalDefId, CrateNum>, extern_crate_map: FxHashMap<LocalDefId, CrateNum>,
export_map: ExportMap<LocalDefId>, export_map: ExportMap<LocalDefId>,
trait_map: NodeMap<Vec<TraitCandidate>>, trait_map: NodeMap<Vec<TraitCandidate>>,
#[cfg(debug_assertions)]
took_trait_map: bool,
/// A map from nodes to anonymous modules. /// A map from nodes to anonymous modules.
/// Anonymous modules are pseudo-modules that are implicitly created around items /// Anonymous modules are pseudo-modules that are implicitly created around items
@ -1139,6 +1141,11 @@ impl ResolverAstLowering for Resolver<'_> {
} }
fn trait_map(&mut self) -> NodeMap<Vec<TraitCandidate>> { fn trait_map(&mut self) -> NodeMap<Vec<TraitCandidate>> {
#[cfg(debug_assertions)]
{
debug_assert!(!self.took_trait_map);
self.took_trait_map = true;
}
std::mem::take(&mut self.trait_map) std::mem::take(&mut self.trait_map)
} }
@ -1287,6 +1294,8 @@ impl<'a> Resolver<'a> {
extern_crate_map: Default::default(), extern_crate_map: Default::default(),
export_map: FxHashMap::default(), export_map: FxHashMap::default(),
trait_map: Default::default(), trait_map: Default::default(),
#[cfg(debug_assertions)]
took_trait_map: false,
underscore_disambiguator: 0, underscore_disambiguator: 0,
empty_module, empty_module,
module_map, module_map,