[PATCH] D132503: Add cxx scope if needed for requires clause.

[Luke Nihlen via Phabricator via cfe-commits]

luken-google updated this revision to Diff 455217.
luken-google added a comment.

Fix clang-format errors


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D132503/new/

https://reviews.llvm.org/D132503

Files:
  clang/lib/Parse/ParseTemplate.cpp
  clang/test/Parser/cxx-concepts-requires-clause.cpp


Index: clang/test/Parser/cxx-concepts-requires-clause.cpp
===================================================================
--- clang/test/Parser/cxx-concepts-requires-clause.cpp
+++ clang/test/Parser/cxx-concepts-requires-clause.cpp
@@ -12,6 +12,7 @@
   struct AA;
   enum E : int;
   static int x;
+  static constexpr int z = 16;
 
   template <typename> requires true
   void Mfoo();
@@ -24,6 +25,8 @@
 
   template <typename TT> requires true
   using MQ = M<TT>;
+
+  constexpr int bazz() requires (z == 16);
 };
 
 template <typename T> requires (!0)
@@ -56,6 +59,9 @@
 template <typename T> requires true
 using Q = A<T>;
 
+template<typename T> requires (!0)
+constexpr int A<T>::bazz() requires (z == 16) { return z; }
+
 struct C {
   template <typename> requires true
   void Mfoo();
Index: clang/lib/Parse/ParseTemplate.cpp
===================================================================
--- clang/lib/Parse/ParseTemplate.cpp
+++ clang/lib/Parse/ParseTemplate.cpp
@@ -289,8 +289,16 @@
 
   LateParsedAttrList LateParsedAttrs(true);
   if (DeclaratorInfo.isFunctionDeclarator()) {
-    if (Tok.is(tok::kw_requires))
+    if (Tok.is(tok::kw_requires)) {
+      DeclaratorScopeObj DeclScopeObj(*this, DeclaratorInfo.getCXXScopeSpec());
+      if (DeclaratorInfo.getCXXScopeSpec().isValid()) {
+        if (Actions.ShouldEnterDeclaratorScope(
+                getCurScope(), DeclaratorInfo.getCXXScopeSpec())) {
+          DeclScopeObj.EnterDeclaratorScope();
+        }
+      }
       ParseTrailingRequiresClause(DeclaratorInfo);
+    }
 
     MaybeParseGNUAttributes(DeclaratorInfo, &LateParsedAttrs);
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D132503.455217.patch
Type: text/x-patch
Size: 1624 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220824/4381f1bf/attachment.bin>