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
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index fd873a3..61e08b1 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -220,6 +220,8 @@
- 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 141957c..741c031 100644
--- a/clang/lib/AST/Mangle.cpp
+++ b/clang/lib/AST/Mangle.cpp
@@ -367,9 +367,11 @@
}
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 0000000..6def647
--- /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]",
