From c5bf901b1b2804eede51b07d9d171c5656dd49fa Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron@aaronballman.com>
Date: Tue, 29 Apr 2025 07:55:32 -0400
Subject: [PATCH] Fix crash with -ast-dump=json (#137324)

When given an invalid Objective-C extension, Clang would crash when
trying to emit the mangled name of the method to the JSON dump output.

Fixes #137320
---
 clang/docs/ReleaseNotes.rst                       |  2 ++
 clang/lib/AST/Mangle.cpp                          |  8 +++++---
 clang/test/AST/ast-crash-dump-mangled-name-json.m | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 clang/test/AST/ast-crash-dump-mangled-name-json.m

diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index fd873a302a30..61e08b15e810 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -220,6 +220,8 @@ Non-comprehensive list of changes in this release
 - Added `__builtin_elementwise_exp10`.
 - For AMDPGU targets, added `__builtin_v_cvt_off_f32_i4` that maps to the `v_cvt_off_f32_i4` instruction.
 - Added `__builtin_elementwise_minnum` and `__builtin_elementwise_maxnum`.
+- No longer crashing on invalid Objective-C categories and extensions when
+  dumping the AST as JSON. (#GH137320)
 
 New Compiler Flags
 ------------------
diff --git a/clang/lib/AST/Mangle.cpp b/clang/lib/AST/Mangle.cpp
index 141957c1cdce..741c031a4038 100644
--- a/clang/lib/AST/Mangle.cpp
+++ b/clang/lib/AST/Mangle.cpp
@@ -367,9 +367,11 @@ void MangleContext::mangleObjCMethodName(const ObjCMethodDecl *MD,
   }
   OS << (MD->isInstanceMethod() ? '-' : '+') << '[';
   if (const auto *CID = MD->getCategory()) {
-    OS << CID->getClassInterface()->getName();
-    if (includeCategoryNamespace) {
-      OS << '(' << *CID << ')';
+    if (const auto *CI = CID->getClassInterface()) {
+      OS << CI->getName();
+      if (includeCategoryNamespace) {
+        OS << '(' << *CID << ')';
+      }
     }
   } else if (const auto *CD =
                  dyn_cast<ObjCContainerDecl>(MD->getDeclContext())) {
diff --git a/clang/test/AST/ast-crash-dump-mangled-name-json.m b/clang/test/AST/ast-crash-dump-mangled-name-json.m
new file mode 100644
index 000000000000..6def64761bd2
--- /dev/null
+++ b/clang/test/AST/ast-crash-dump-mangled-name-json.m
@@ -0,0 +1,14 @@
+// RUN: not %clang_cc1 -ast-dump=json %s 2>&1 | FileCheck %s
+
+// Ensure that dumping this does not crash when emitting the mangled name.
+// See GH137320 for details.
+// Note, this file does not compile and so we also check the error.
+
+@interface SomeClass (SomeExtension)
++ (void)someMethod;
+@end
+
+// CHECK: error: cannot find interface declaration for 'SomeClass'
+
+// CHECK: "name": "someMethod"
+// CHECK-NEXT: "mangledName": "+[ someMethod]",