From 799efd3615f468c1382c61fe73b137fcffcd0a78 Mon Sep 17 00:00:00 2001
From: varkor <github@varkor.com>
Date: Fri, 10 Jan 2020 22:29:57 +0000
Subject: [PATCH] Fix issue with using `self` module via indirection

---
 src/librustc_privacy/lib.rs       | 3 +++
 src/test/ui/issues/issue-68103.rs | 6 ++++++
 2 files changed, 9 insertions(+)
 create mode 100644 src/test/ui/issues/issue-68103.rs

diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs
index a96d59340237d..70d4841ec244b 100644
--- a/src/librustc_privacy/lib.rs
+++ b/src/librustc_privacy/lib.rs
@@ -652,6 +652,9 @@ impl EmbargoVisitor<'tcx> {
             if let Some(item) = module
                 .res
                 .and_then(|res| res.mod_def_id())
+                // If the module is `self`, i.e. the current crate,
+                // there will be no corresponding item.
+                .filter(|def_id| def_id.index != CRATE_DEF_INDEX || def_id.krate != LOCAL_CRATE)
                 .and_then(|def_id| self.tcx.hir().as_local_hir_id(def_id))
                 .map(|module_hir_id| self.tcx.hir().expect_item(module_hir_id))
             {
diff --git a/src/test/ui/issues/issue-68103.rs b/src/test/ui/issues/issue-68103.rs
new file mode 100644
index 0000000000000..e775678fc6053
--- /dev/null
+++ b/src/test/ui/issues/issue-68103.rs
@@ -0,0 +1,6 @@
+// check-pass
+
+pub extern crate self as name;
+pub use name::name as bug;
+
+fn main() {}