diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs
index dddee1c9926..c68289adb10 100644
--- a/src/librustc_save_analysis/lib.rs
+++ b/src/librustc_save_analysis/lib.rs
@@ -816,7 +816,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
     fn lookup_def_id(&self, ref_id: NodeId) -> Option<DefId> {
         match self.get_path_res(ref_id) {
             Res::PrimTy(_) | Res::SelfTy(..) | Res::Err => None,
-            def => Some(def.def_id()),
+            def => def.opt_def_id(),
         }
     }
 
diff --git a/src/test/ui/attributes/register-attr-tool-import.rs b/src/test/ui/attributes/register-attr-tool-import.rs
index e01dc4dfa49..d3502c71f2d 100644
--- a/src/test/ui/attributes/register-attr-tool-import.rs
+++ b/src/test/ui/attributes/register-attr-tool-import.rs
@@ -1,4 +1,6 @@
 // edition:2018
+// compile-flags: -Zsave-analysis
+// ~^ Also regression test for #69588
 
 #![feature(register_attr)]
 #![feature(register_tool)]
diff --git a/src/test/ui/attributes/register-attr-tool-import.stderr b/src/test/ui/attributes/register-attr-tool-import.stderr
index 59f5a8620ab..90b7e169a2f 100644
--- a/src/test/ui/attributes/register-attr-tool-import.stderr
+++ b/src/test/ui/attributes/register-attr-tool-import.stderr
@@ -1,35 +1,35 @@
 error: cannot use an explicitly registered attribute through an import
-  --> $DIR/register-attr-tool-import.rs:12:3
+  --> $DIR/register-attr-tool-import.rs:14:3
    |
 LL | #[renamed_attr]
    |   ^^^^^^^^^^^^
    |
 note: the explicitly registered attribute imported here
-  --> $DIR/register-attr-tool-import.rs:9:5
+  --> $DIR/register-attr-tool-import.rs:11:5
    |
 LL | use attr as renamed_attr; // OK
    |     ^^^^^^^^^^^^^^^^^^^^
 
 error: cannot use a tool module through an import
-  --> $DIR/register-attr-tool-import.rs:13:3
+  --> $DIR/register-attr-tool-import.rs:15:3
    |
 LL | #[renamed_tool::attr]
    |   ^^^^^^^^^^^^
    |
 note: the tool module imported here
-  --> $DIR/register-attr-tool-import.rs:10:5
+  --> $DIR/register-attr-tool-import.rs:12:5
    |
 LL | use tool as renamed_tool; // OK
    |     ^^^^^^^^^^^^^^^^^^^^
 
 error: cannot use a tool module through an import
-  --> $DIR/register-attr-tool-import.rs:13:3
+  --> $DIR/register-attr-tool-import.rs:15:3
    |
 LL | #[renamed_tool::attr]
    |   ^^^^^^^^^^^^
    |
 note: the tool module imported here
-  --> $DIR/register-attr-tool-import.rs:10:5
+  --> $DIR/register-attr-tool-import.rs:12:5
    |
 LL | use tool as renamed_tool; // OK
    |     ^^^^^^^^^^^^^^^^^^^^