diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index 3b96455424335a24d5471810c52f1fce7032396a..0173c4933f821f08e92c2387275fec9a9ad6e7a1 100644
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -965,7 +965,7 @@ pub fn codegen_units(&self) -> usize {
     }
 
     pub fn teach(&self, code: &DiagnosticId) -> bool {
-        self.opts.debugging_opts.teach && self.parse_sess.span_diagnostic.must_teach(code)
+        self.opts.debugging_opts.teach && self.diagnostic().must_teach(code)
     }
 
     /// Are we allowed to use features from the Rust 2018 edition?
diff --git a/src/librustc_codegen_utils/codegen_backend.rs b/src/librustc_codegen_utils/codegen_backend.rs
index 7e726f00b0bf159f5467f15af32fbb74d703b36a..ae8f65303a7fec7b95cc4b869ea67e1c8d7b53b6 100644
--- a/src/librustc_codegen_utils/codegen_backend.rs
+++ b/src/librustc_codegen_utils/codegen_backend.rs
@@ -116,7 +116,7 @@ fn init(&self, sess: &Session) {
             match *cty {
                 CrateType::Rlib | CrateType::Dylib | CrateType::Executable => {},
                 _ => {
-                    sess.parse_sess.span_diagnostic.warn(
+                    sess.diagnostic().warn(
                         &format!("LLVM unsupported, so output type {} is not supported", cty)
                     );
                 },
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs
index 27b747c633cfe864a07618252967d3f2fe9f2683..805a5ecd9913010a0ad68830b81c83f3a41cdc4d 100644
--- a/src/librustc_driver/driver.rs
+++ b/src/librustc_driver/driver.rs
@@ -1133,7 +1133,7 @@ pub fn phase_2_configure_and_expand_inner<'a, 'b: 'a, F>(
     // Unresolved macros might be due to mistyped `#[macro_use]`,
     // so abort after checking for unknown attributes. (#49074)
     if resolver.found_unresolved_macro {
-        sess.parse_sess.span_diagnostic.abort_if_errors();
+        sess.diagnostic().abort_if_errors();
     }
 
     // Lower ast -> hir.
diff --git a/src/librustc_passes/ast_validation.rs b/src/librustc_passes/ast_validation.rs
index c6bad9e1980fb8b9627b3137da0409d57f376ff9..0ea90e745319004513a8df8a740f08a95d1a618a 100644
--- a/src/librustc_passes/ast_validation.rs
+++ b/src/librustc_passes/ast_validation.rs
@@ -32,7 +32,7 @@ struct AstValidator<'a> {
 
 impl<'a> AstValidator<'a> {
     fn err_handler(&self) -> &errors::Handler {
-        &self.session.parse_sess.span_diagnostic
+        &self.session.diagnostic()
     }
 
     fn check_lifetime(&self, ident: Ident) {