https://github.com/egorzhdan created
https://github.com/llvm/llvm-project/pull/101001
This fixes a crash during `CXXMethod->getName()` in `Sema::ProcessAPINotes`: we
were trying to get the name of a C++ method as a string, which fails with an
assertion if the name is not a simple identifier.
>From 0993d9e4b1161b3ec38309f2b1f00d61da034006 Mon Sep 17 00:00:00 2001
From: Egor Zhdan <e_zh...@apple.com>
Date: Mon, 29 Jul 2024 13:01:18 +0100
Subject: [PATCH] [APINotes] Do not crash for C++ operators
This fixes a crash during `CXXMethod->getName()` in `Sema::ProcessAPINotes`: we
were trying to get the name of a C++ method as a string, which fails with an
assertion if the name is not a simple identifier.
---
clang/lib/Sema/SemaAPINotes.cpp | 12 +++++++-----
clang/test/APINotes/Inputs/Headers/Methods.h | 6 ++++++
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/clang/lib/Sema/SemaAPINotes.cpp b/clang/lib/Sema/SemaAPINotes.cpp
index be5b7b92dfe6f..2350cbc0f420f 100644
--- a/clang/lib/Sema/SemaAPINotes.cpp
+++ b/clang/lib/Sema/SemaAPINotes.cpp
@@ -1044,11 +1044,13 @@ void Sema::ProcessAPINotes(Decl *D) {
if (auto TagContext = dyn_cast<TagDecl>(D->getDeclContext())) {
if (auto CXXMethod = dyn_cast<CXXMethodDecl>(D)) {
- for (auto Reader : APINotes.findAPINotes(D->getLocation())) {
- if (auto Context = UnwindTagContext(TagContext, APINotes)) {
- auto Info =
- Reader->lookupCXXMethod(Context->id, CXXMethod->getName());
- ProcessVersionedAPINotes(*this, CXXMethod, Info);
+ if (CXXMethod->getIdentifier()) {
+ for (auto Reader : APINotes.findAPINotes(D->getLocation())) {
+ if (auto Context = UnwindTagContext(TagContext, APINotes)) {
+ auto Info =
+ Reader->lookupCXXMethod(Context->id, CXXMethod->getName());
+ ProcessVersionedAPINotes(*this, CXXMethod, Info);
+ }
}
}
}
diff --git a/clang/test/APINotes/Inputs/Headers/Methods.h
b/clang/test/APINotes/Inputs/Headers/Methods.h
index 6a96b12762871..cbb57ccd0afbd 100644
--- a/clang/test/APINotes/Inputs/Headers/Methods.h
+++ b/clang/test/APINotes/Inputs/Headers/Methods.h
@@ -2,6 +2,8 @@ struct IntWrapper {
int value;
IntWrapper getIncremented() const { return {value + 1}; }
+
+ IntWrapper operator+(const IntWrapper& RHS) const { return {value +
RHS.value}; }
};
struct Outer {
@@ -9,5 +11,9 @@ struct Outer {
int value;
Inner getDecremented() const { return {value - 1}; }
+
+ bool operator==(const Inner& RHS) const {
+ return value == RHS.value;
+ }
};
};
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
