From b749e3cc18e5f0fbcbe595ccf104141a37c06c9d Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Fri, 8 Apr 2016 00:47:32 +0000 Subject: [PATCH 1/2] Fix ICE in resolve --- src/librustc_resolve/resolve_imports.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs index 738a99fbe9200..d2b458b8396a6 100644 --- a/src/librustc_resolve/resolve_imports.rs +++ b/src/librustc_resolve/resolve_imports.rs @@ -332,6 +332,7 @@ impl<'a> ::ModuleS<'a> { fn define_in_glob_importers(&self, name: Name, ns: Namespace, binding: &'a NameBinding<'a>) { if !binding.defined_with(DefModifiers::PUBLIC | DefModifiers::IMPORTABLE) { return } + let _resolutions = self.resolutions.borrow(); for &(importer, directive) in self.glob_importers.borrow_mut().iter() { let _ = importer.try_define_child(name, ns, directive.import(binding, None)); } From f168aa66696411dbb99ac133e663db22e882fc54 Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Fri, 8 Apr 2016 01:35:51 +0000 Subject: [PATCH 2/2] Add regression test --- src/test/compile-fail/issue-32797.rs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/test/compile-fail/issue-32797.rs diff --git a/src/test/compile-fail/issue-32797.rs b/src/test/compile-fail/issue-32797.rs new file mode 100644 index 0000000000000..effe528384e48 --- /dev/null +++ b/src/test/compile-fail/issue-32797.rs @@ -0,0 +1,24 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(rustc_attrs)] + +pub use self::bar::*; +mod bar { + pub use super::*; +} + +pub use self::baz::*; +mod baz { + pub use main as f; +} + +#[rustc_error] +pub fn main() {} //~ ERROR compilation successful