[Clang] fixed false positive redeclaration error for using enum in nested scopes

[a-tarasyuk]

Fixes #147495

---

This patch addresses the issue of false-positive redeclaration errors that occur for using enum declarations in nested class scopes

struct S {
  enum class E { A };
  using enum E;

  struct S1 {
    using enum E; // no error
  };
};

[llvmbot]

@llvm/pr-subscribers-clang

Author: Oleksandr T. (a-tarasyuk)

Changes

Fixes #147495

---

This patch addresses the issue of false-positive redeclaration errors that occur for using enum declarations in nested class scopes

struct S {
  enum class E { A };
  using enum E;

  struct S1 {
    using enum E; // no error
  };
};

---

Full diff: https://github.com/llvm/llvm-project/pull/147711.diff

3 Files Affected:

• (modified) clang/docs/ReleaseNotes.rst (+3-1)
• (modified) clang/lib/Sema/SemaDeclCXX.cpp (+1-1)
• (modified) clang/test/SemaCXX/cxx20-using-enum.cpp (+14)

diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 57a94242c9e61..086f0fce4975f 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -770,8 +770,10 @@ Bug Fixes in This Version
 - In C23, something like ``[[/*possible attributes*/]];`` is an attribute
   declaration, not a statement. So it is not allowed by the syntax in places
   where a statement is required, specifically as the secondary block of a
-  selection or iteration statement. This differs from C++, since C++ allows 
+  selection or iteration statement. This differs from C++, since C++ allows
   declaration statements. Clang now emits a warning for these patterns. (#GH141659)
+- Fixed false positives for redeclaration errors of using enum in
+  nested scopes. (#GH147495)
 
 Bug Fixes to Compiler Builtins
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index a49a8abb677c5..5cc92ebb0171f 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -13308,7 +13308,7 @@ NamedDecl *Sema::BuildUsingEnumDeclaration(Scope *S, AccessSpecifier AS,
     LookupResult Previous(*this, UsingEnumName, LookupUsingDeclName,
                           RedeclarationKind::ForVisibleRedeclaration);
 
-    LookupName(Previous, S);
+    LookupQualifiedName(Previous, CurContext);
 
     for (NamedDecl *D : Previous)
       if (UsingEnumDecl *UED = dyn_cast<UsingEnumDecl>(D))
diff --git a/clang/test/SemaCXX/cxx20-using-enum.cpp b/clang/test/SemaCXX/cxx20-using-enum.cpp
index 14ef4b29925a1..775b65c5a8d8e 100644
--- a/clang/test/SemaCXX/cxx20-using-enum.cpp
+++ b/clang/test/SemaCXX/cxx20-using-enum.cpp
@@ -274,4 +274,18 @@ void f(int a) {
 }
 }
 
+namespace GH147495 {
+struct S {
+  enum class E { A };
+  using enum E;
+
+  struct S1 {
+    using enum E;
+  };
+
+  struct S2 {
+    using E::A;
+  };
+};
+}
 #endif

[AaronBallman]

LGTM!