[clang] cfb86ae - [Clang][Sema] Skip checking anonymous enum in using enum declaration (#87144)
via cfe-commits
cfe-commits at lists.llvm.org
Fri Apr 5 00:18:11 PDT 2024
Author: Qizhi Hu
Date: 2024-04-05T15:18:07+08:00
New Revision: cfb86ae7497e43e9221ab890221789ae320381e9
URL: https://github.com/llvm/llvm-project/commit/cfb86ae7497e43e9221ab890221789ae320381e9
DIFF: https://github.com/llvm/llvm-project/commit/cfb86ae7497e43e9221ab890221789ae320381e9.diff
LOG: [Clang][Sema] Skip checking anonymous enum in using enum declaration (#87144)
Try to fix https://github.com/llvm/llvm-project/issues/86790
`getFETokenInfo` requires `DeclarationName` shouldn't be empty and this
will produce crash when checking name conflict of an anonymous
`NamedDecl` in `Sema::PushOnScopeChains` and whether it's a reserved
identifier or not. These wouldn't happen when it's a anonymous enum and
we can skip the checking and just add the declaration to current scope.
Co-authored-by: huqizhi <836744285 at qq.com>
Added:
clang/test/SemaCXX/PR86790.cpp
Modified:
clang/docs/ReleaseNotes.rst
clang/lib/Sema/SemaDecl.cpp
Removed:
################################################################################
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index b11a81139bb1eb..28e8ddb3c41c3e 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -503,6 +503,7 @@ Bug Fixes to C++ Support
- Fix crash when inheriting from a cv-qualified type. Fixes:
(`#35603 <https://github.com/llvm/llvm-project/issues/35603>`_)
+- Fix a crash when the using enum declaration uses an anonymous enumeration. Fixes (#GH86790).
Bug Fixes to AST Handling
^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index cbd84dd2974446..c790dab72dd721 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -1537,6 +1537,10 @@ void Sema::PushOnScopeChains(NamedDecl *D, Scope *S, bool AddToContext) {
cast<FunctionDecl>(D)->isFunctionTemplateSpecialization())
return;
+ if (isa<UsingEnumDecl>(D) && D->getDeclName().isEmpty()) {
+ S->AddDecl(D);
+ return;
+ }
// If this replaces anything in the current scope,
IdentifierResolver::iterator I = IdResolver.begin(D->getDeclName()),
IEnd = IdResolver.end();
diff --git a/clang/test/SemaCXX/PR86790.cpp b/clang/test/SemaCXX/PR86790.cpp
new file mode 100644
index 00000000000000..09e9bb3505e1bf
--- /dev/null
+++ b/clang/test/SemaCXX/PR86790.cpp
@@ -0,0 +1,32 @@
+// RUN: %clang_cc1 -verify -std=c++20 -fsyntax-only %s
+
+enum {A, S, D, F};
+int main() {
+ using asdf = decltype(A);
+ using enum asdf; // this line causes the crash
+ return 0;
+}
+
+namespace N1 {
+ enum {A, S, D, F};
+ constexpr struct T {
+ using asdf = decltype(A);
+ using enum asdf;
+ } t;
+
+ static_assert(t.D == D);
+ static_assert(T::S == S);
+}
+
+namespace N2 {
+ enum {A, S, D, F};
+ constexpr struct T {
+ struct {
+ using asdf = decltype(A);
+ using enum asdf;
+ } inner;
+ } t;
+
+ static_assert(t.inner.D == D);
+ static_assert(t.D == D); // expected-error {{no member named 'D' in 'N2::T'}}
+}
More information about the cfe-commits
mailing list