Merge "merge main into amd-staging" into amd-staging

clang/docs/ReleaseNotes.rst

@@ -569,6 +569,8 @@ Bug Fixes to C++ Support
 - Fixed a crash when trying to evaluate a user-defined ``static_assert`` message whose ``size()``
  function returns a large or negative value. Fixes (#GH89407).
 - Fixed a use-after-free bug in parsing of type constraints with default arguments that involve lambdas. (#GH67235)
+- Fixed bug in which the body of a consteval lambda within a template was not parsed as within an
+ immediate function context.
 
 Bug Fixes to AST Handling
 ^^^^^^^^^^^^^^^^^^^^^^^^^

clang/include/clang/AST/ASTContext.h

@@ -455,7 +455,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
  /// initialization of another module).
  struct PerModuleInitializers {
  llvm::SmallVector<Decl*, 4> Initializers;
- llvm::SmallVector<Decl::DeclID, 4> LazyInitializers;
+ llvm::SmallVector<GlobalDeclID, 4> LazyInitializers;
 
  void resolve(ASTContext &Ctx);
  };
@@ -1059,7 +1059,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
  /// or an ImportDecl nominating another module that has initializers.
  void addModuleInitializer(Module *M, Decl *Init);
 
- void addLazyModuleInitializers(Module *M, ArrayRef<Decl::DeclID> IDs);
+ void addLazyModuleInitializers(Module *M, ArrayRef<GlobalDeclID> IDs);
 
  /// Get the initializations to perform when importing a module, if any.
  ArrayRef<Decl*> getModuleInitializers(Module *M);

clang/include/clang/AST/Decl.h

@@ -157,7 +157,7 @@ class PragmaCommentDecl final
  SourceLocation CommentLoc,
  PragmaMSCommentKind CommentKind,
  StringRef Arg);
- static PragmaCommentDecl *CreateDeserialized(ASTContext &C, DeclID ID,
+ static PragmaCommentDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID,
  unsigned ArgSize);
 
  PragmaMSCommentKind getCommentKind() const { return CommentKind; }
@@ -192,7 +192,7 @@ class PragmaDetectMismatchDecl final
  SourceLocation Loc, StringRef Name,
  StringRef Value);
  static PragmaDetectMismatchDecl *
- CreateDeserialized(ASTContext &C, DeclID ID, unsigned NameValueSize);
+ CreateDeserialized(ASTContext &C, GlobalDeclID ID, unsigned NameValueSize);
 
  StringRef getName() const { return getTrailingObjects<char>(); }
  StringRef getValue() const { return getTrailingObjects<char>() + ValueStart; }
@@ -518,7 +518,7 @@ class LabelDecl : public NamedDecl {
  static LabelDecl *Create(ASTContext &C, DeclContext *DC,
  SourceLocation IdentL, IdentifierInfo *II,
  SourceLocation GnuLabelL);
- static LabelDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static LabelDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  LabelStmt *getStmt() const { return TheStmt; }
  void setStmt(LabelStmt *T) { TheStmt = T; }
@@ -581,7 +581,7 @@ class NamespaceDecl : public NamedDecl, public DeclContext,
  IdentifierInfo *Id, NamespaceDecl *PrevDecl,
  bool Nested);
 
- static NamespaceDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static NamespaceDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  using redecl_range = redeclarable_base::redecl_range;
  using redecl_iterator = redeclarable_base::redecl_iterator;
@@ -1146,7 +1146,7 @@ class VarDecl : public DeclaratorDecl, public Redeclarable<VarDecl> {
  const IdentifierInfo *Id, QualType T,
  TypeSourceInfo *TInfo, StorageClass S);
 
- static VarDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static VarDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  SourceRange getSourceRange() const override LLVM_READONLY;
 
@@ -1728,7 +1728,7 @@ class ImplicitParamDecl : public VarDecl {
  static ImplicitParamDecl *Create(ASTContext &C, QualType T,
  ImplicitParamKind ParamKind);
 
- static ImplicitParamDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static ImplicitParamDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  ImplicitParamDecl(ASTContext &C, DeclContext *DC, SourceLocation IdLoc,
  const IdentifierInfo *Id, QualType Type,
@@ -1782,7 +1782,7 @@ class ParmVarDecl : public VarDecl {
  TypeSourceInfo *TInfo, StorageClass S,
  Expr *DefArg);
 
- static ParmVarDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static ParmVarDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  SourceRange getSourceRange() const override LLVM_READONLY;
 
@@ -2178,7 +2178,7 @@ class FunctionDecl : public DeclaratorDecl,
  bool hasWrittenPrototype, ConstexprSpecKind ConstexprKind,
  Expr *TrailingRequiresClause);
 
- static FunctionDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static FunctionDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  DeclarationNameInfo getNameInfo() const {
  return DeclarationNameInfo(getDeclName(), getLocation(), DNLoc);
@@ -3136,7 +3136,7 @@ class FieldDecl : public DeclaratorDecl, public Mergeable<FieldDecl> {
  TypeSourceInfo *TInfo, Expr *BW, bool Mutable,
  InClassInitStyle InitStyle);
 
- static FieldDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static FieldDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  /// Returns the index of this field within its record,
  /// as appropriate for passing to ASTRecordLayout::getFieldOffset.
@@ -3311,7 +3311,7 @@ class EnumConstantDecl : public ValueDecl,
  SourceLocation L, IdentifierInfo *Id,
  QualType T, Expr *E,
  const llvm::APSInt &V);
- static EnumConstantDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static EnumConstantDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  const Expr *getInitExpr() const { return (const Expr*) Init; }
  Expr *getInitExpr() { return (Expr*) Init; }
@@ -3357,7 +3357,7 @@ class IndirectFieldDecl : public ValueDecl,
  QualType T,
  llvm::MutableArrayRef<NamedDecl *> CH);
 
- static IndirectFieldDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static IndirectFieldDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  using chain_iterator = ArrayRef<NamedDecl *>::const_iterator;
 
@@ -3542,7 +3542,7 @@ class TypedefDecl : public TypedefNameDecl {
  static TypedefDecl *Create(ASTContext &C, DeclContext *DC,
  SourceLocation StartLoc, SourceLocation IdLoc,
  const IdentifierInfo *Id, TypeSourceInfo *TInfo);
- static TypedefDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static TypedefDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  SourceRange getSourceRange() const override LLVM_READONLY;
 
@@ -3567,7 +3567,7 @@ class TypeAliasDecl : public TypedefNameDecl {
  static TypeAliasDecl *Create(ASTContext &C, DeclContext *DC,
  SourceLocation StartLoc, SourceLocation IdLoc,
  const IdentifierInfo *Id, TypeSourceInfo *TInfo);
- static TypeAliasDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static TypeAliasDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  SourceRange getSourceRange() const override LLVM_READONLY;
 
@@ -3977,7 +3977,7 @@ class EnumDecl : public TagDecl {
  IdentifierInfo *Id, EnumDecl *PrevDecl,
  bool IsScoped, bool IsScopedUsingClassTag,
  bool IsFixed);
- static EnumDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static EnumDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  /// Overrides to provide correct range when there's an enum-base specifier
  /// with forward declarations.
@@ -4182,7 +4182,7 @@ class RecordDecl : public TagDecl {
  static RecordDecl *Create(const ASTContext &C, TagKind TK, DeclContext *DC,
  SourceLocation StartLoc, SourceLocation IdLoc,
  IdentifierInfo *Id, RecordDecl* PrevDecl = nullptr);
- static RecordDecl *CreateDeserialized(const ASTContext &C, DeclID ID);
+ static RecordDecl *CreateDeserialized(const ASTContext &C, GlobalDeclID ID);
 
  RecordDecl *getPreviousDecl() {
  return cast_or_null<RecordDecl>(
@@ -4433,7 +4433,7 @@ class FileScopeAsmDecl : public Decl {
  StringLiteral *Str, SourceLocation AsmLoc,
  SourceLocation RParenLoc);
 
- static FileScopeAsmDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static FileScopeAsmDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  SourceLocation getAsmLoc() const { return getLocation(); }
  SourceLocation getRParenLoc() const { return RParenLoc; }
@@ -4469,7 +4469,7 @@ class TopLevelStmtDecl : public Decl, public DeclContext {
 
 public:
  static TopLevelStmtDecl *Create(ASTContext &C, Stmt *Statement);
- static TopLevelStmtDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static TopLevelStmtDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  SourceRange getSourceRange() const override LLVM_READONLY;
  Stmt *getStmt() { return Statement; }
@@ -4563,7 +4563,7 @@ class BlockDecl : public Decl, public DeclContext {
 
 public:
  static BlockDecl *Create(ASTContext &C, DeclContext *DC, SourceLocation L);
- static BlockDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static BlockDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  SourceLocation getCaretLocation() const { return getLocation(); }
 
@@ -4717,7 +4717,7 @@ class CapturedDecl final
 
  static CapturedDecl *Create(ASTContext &C, DeclContext *DC,
  unsigned NumParams);
- static CapturedDecl *CreateDeserialized(ASTContext &C, DeclID ID,
+ static CapturedDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID,
  unsigned NumParams);
 
  Stmt *getBody() const override;
@@ -4851,7 +4851,7 @@ class ImportDecl final : public Decl,
  SourceLocation EndLoc);
 
  /// Create a new, deserialized module import declaration.
- static ImportDecl *CreateDeserialized(ASTContext &C, DeclID ID,
+ static ImportDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID,
  unsigned NumLocations);
 
  /// Retrieve the module that was imported by the import declaration.
@@ -4892,7 +4892,7 @@ class ExportDecl final : public Decl, public DeclContext {
 public:
  static ExportDecl *Create(ASTContext &C, DeclContext *DC,
  SourceLocation ExportLoc);
- static ExportDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static ExportDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  SourceLocation getExportLoc() const { return getLocation(); }
  SourceLocation getRBraceLoc() const { return RBraceLoc; }
@@ -4931,7 +4931,7 @@ class EmptyDecl : public Decl {
 public:
  static EmptyDecl *Create(ASTContext &C, DeclContext *DC,
  SourceLocation L);
- static EmptyDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static EmptyDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  static bool classof(const Decl *D) { return classofKind(D->getKind()); }
  static bool classofKind(Kind K) { return K == Empty; }
@@ -4957,7 +4957,7 @@ class HLSLBufferDecl final : public NamedDecl, public DeclContext {
  bool CBuffer, SourceLocation KwLoc,
  IdentifierInfo *ID, SourceLocation IDLoc,
  SourceLocation LBrace);
- static HLSLBufferDecl *CreateDeserialized(ASTContext &C, DeclID ID);
+ static HLSLBufferDecl *CreateDeserialized(ASTContext &C, GlobalDeclID ID);
 
  SourceRange getSourceRange() const override LLVM_READONLY {
  return SourceRange(getLocStart(), RBraceLoc);

clang/include/clang/AST/DeclBase.h

@@ -15,6 +15,7 @@
 
 #include "clang/AST/ASTDumperUtils.h"
 #include "clang/AST/AttrIterator.h"
+#include "clang/AST/DeclID.h"
 #include "clang/AST/DeclarationName.h"
 #include "clang/AST/SelectorLocationsKind.h"
 #include "clang/Basic/IdentifierTable.h"
@@ -239,9 +240,6 @@ class alignas(8) Decl {
  ModulePrivate
  };
 
- /// An ID number that refers to a declaration in an AST file.
- using DeclID = uint32_t;
-
 protected:
  /// The next declaration within the same lexical
  /// DeclContext. These pointers form the linked list that is
@@ -361,7 +359,7 @@ class alignas(8) Decl {
  /// \param Ctx The context in which we will allocate memory.
  /// \param ID The global ID of the deserialized declaration.
  /// \param Extra The amount of extra space to allocate after the object.
- void *operator new(std::size_t Size, const ASTContext &Ctx, DeclID ID,
+ void *operator new(std::size_t Size, const ASTContext &Ctx, GlobalDeclID ID,
  std::size_t Extra = 0);
 
  /// Allocate memory for a non-deserialized declaration.
@@ -779,10 +777,10 @@ class alignas(8) Decl {
 
  /// Retrieve the global declaration ID associated with this
  /// declaration, which specifies where this Decl was loaded from.
- DeclID getGlobalID() const {
+ GlobalDeclID getGlobalID() const {
  if (isFromASTFile())
- return *((const DeclID *)this - 1);
- return 0;
+ return (*((const GlobalDeclID *)this - 1));
+ return GlobalDeclID();
  }
 
  /// Retrieve the global ID of the module that owns this particular