From 8c7d9f609212d4525cc05e2d1d4955425d78f7d8 Mon Sep 17 00:00:00 2001
From: Takayuki Maeda <takoyaki0316@gmail.com>
Date: Tue, 28 Jun 2022 18:29:07 +0900
Subject: fix ice for associated constant generics

---
 compiler/rustc_span/src/source_map.rs   |  2 +-
 src/test/ui/generics/issue-98432.rs     |  9 +++++++++
 src/test/ui/generics/issue-98432.stderr | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 src/test/ui/generics/issue-98432.rs
 create mode 100644 src/test/ui/generics/issue-98432.stderr

diff --git a/compiler/rustc_span/src/source_map.rs b/compiler/rustc_span/src/source_map.rs
index 95ea7029617..227127aed50 100644
--- a/compiler/rustc_span/src/source_map.rs
+++ b/compiler/rustc_span/src/source_map.rs
@@ -956,7 +956,7 @@ impl SourceMap {
     }
 
     pub fn generate_fn_name_span(&self, span: Span) -> Option<Span> {
-        let prev_span = self.span_extend_to_prev_str(span, "fn", true, true).unwrap_or(span);
+        let prev_span = self.span_extend_to_prev_str(span, "fn", true, true)?;
         if let Ok(snippet) = self.span_to_snippet(prev_span) {
             debug!(
                 "generate_fn_name_span: span={:?}, prev_span={:?}, snippet={:?}",
diff --git a/src/test/ui/generics/issue-98432.rs b/src/test/ui/generics/issue-98432.rs
new file mode 100644
index 00000000000..780c50d6ffa
--- /dev/null
+++ b/src/test/ui/generics/issue-98432.rs
@@ -0,0 +1,9 @@
+struct Struct<T>(T);
+
+impl<T> Struct<T> {
+    const CONST: fn() = || {
+        struct _Obligation where T:; //~ ERROR can't use generic parameters from outer function
+    };
+}
+
+fn main() {}
diff --git a/src/test/ui/generics/issue-98432.stderr b/src/test/ui/generics/issue-98432.stderr
new file mode 100644
index 00000000000..afa67b63bd9
--- /dev/null
+++ b/src/test/ui/generics/issue-98432.stderr
@@ -0,0 +1,14 @@
+error[E0401]: can't use generic parameters from outer function
+  --> $DIR/issue-98432.rs:5:34
+   |
+LL | impl<T> Struct<T> {
+   |      - type parameter from outer function
+LL |     const CONST: fn() = || {
+LL |         struct _Obligation where T:;
+   |                                  ^ use of generic parameter from outer function
+   |
+   = help: try using a local generic parameter instead
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0401`.
-- 
cgit v1.2.1