Fix merge

Author: cor3ntin

clang/include/clang/AST/DeclCXX.h

@@ -3507,15 +3507,15 @@ class TypeAliasDecl : public TypedefNameDecl {
   SourceLocation EllipsisLoc;
 
   TypeAliasDecl(ASTContext &C, DeclContext *DC, SourceLocation StartLoc,
-                SourceLocation IdLoc, IdentifierInfo *Id, TypeSourceInfo *TInfo,
+                SourceLocation IdLoc, const IdentifierInfo *Id, TypeSourceInfo *TInfo,
                 SourceLocation EllipsisLoc)
       : TypedefNameDecl(TypeAlias, C, DC, StartLoc, IdLoc, Id, TInfo),
         Template(nullptr), EllipsisLoc(EllipsisLoc) {}
 
 public:
   static TypeAliasDecl *Create(ASTContext &C, DeclContext *DC,
                                SourceLocation StartLoc, SourceLocation IdLoc,
-                               IdentifierInfo *Id, TypeSourceInfo *TInfo,
+                               const IdentifierInfo *Id, TypeSourceInfo *TInfo,
                                SourceLocation EllipsisLoc);
   static TypeAliasDecl *CreateDeserialized(ASTContext &C, unsigned ID);
 

clang/lib/AST/Decl.cpp

@@ -5564,7 +5564,7 @@ TypedefDecl *TypedefDecl::CreateDeserialized(ASTContext &C, unsigned ID) {
 
 TypeAliasDecl *TypeAliasDecl::Create(ASTContext &C, DeclContext *DC,
                                      SourceLocation StartLoc,
-                                     SourceLocation IdLoc, IdentifierInfo *Id,
+                                     SourceLocation IdLoc, const IdentifierInfo *Id,
                                      TypeSourceInfo *TInfo,
                                      SourceLocation EllipsisLoc) {
   return new (C, DC)

clang/test/SemaCXX/cxx2c-alias-packs.cpp

@@ -24,12 +24,12 @@ struct S {
 };
 template <typename... Ts>
 struct e1 {
-   using a = S<Ts...>::...types;
-   using b = S<Ts...>::...types::a;
-   using ...c = S<Ts...>::types;
-   using ...d = S<Ts...>::types::a;
-   S<Ts...>::...types e;
-   S<Ts...>::...types::a f;
+   using a = S<Ts...>::...types; // expected-error {{declaration type contains unexpanded parameter pack 'types'}}
+   using b = S<Ts...>::...types::a; // expected-error {{declaration type contains unexpanded parameter pack 'types'}}
+   using ...c = S<Ts...>::types; // expected-error {{'typename S<Ts...>::types' does not contain an unexpanded pack}}
+   using ...d = S<Ts...>::types::a; // expected-error {{'typename S<Ts...>::types::a' does not contain an unexpanded pack}}
+   S<Ts...>::...types e; // expected-error {{data member type contains unexpanded parameter pack 'types'}}
+   S<Ts...>::...types::a f; // expected-error {{data member type contains unexpanded parameter pack 'types'}}
 };
 
 template <typename... Ts>