Vendor import of llvm-project main llvmorg-18-init-15692-g007ed0dccd6a. - src

diff options


context:
space:
mode:

author	Dimitry Andric <dim@FreeBSD.org>	2023-12-25 13:49:57 +0000
committer	Dimitry Andric <dim@FreeBSD.org>	2023-12-25 13:49:57 +0000
commit	99aabd70801bd4bc72c4942747f6d62c675112f5 (patch)
tree	02bf056e9098f5ecddc7f18a99db9c79f4404b02 /clang/lib/Serialization/ASTReaderDecl.cpp
parent	312c0ed19cc5276a17bacf2120097bec4515b0f1 (diff)

Vendor import of llvm-project main llvmorg-18-init-15692-g007ed0dccd6a.vendor/llvm-project/llvmorg-18-init-15692-g007ed0dccd6a

Diffstat (limited to 'clang/lib/Serialization/ASTReaderDecl.cpp')

-rw-r--r--

clang/lib/Serialization/ASTReaderDecl.cpp

1 files changed, 27 insertions, 25 deletions

diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp
index 7140a14aefbf..d989707d5575 100644
--- a/clang/lib/Serialization/ASTReaderDecl.cpp
+++ b/clang/lib/Serialization/ASTReaderDecl.cpp

@@ -584,7 +584,18 @@ void ASTDeclReader::Visit(Decl *D) {

void ASTDeclReader::VisitDecl(Decl *D) {

BitsUnpacker DeclBits(Record.readInt());

+ auto ModuleOwnership =

+ (Decl::ModuleOwnershipKind)DeclBits.getNextBits(/*Width=*/3);

+ D->setReferenced(DeclBits.getNextBit());

+ D->Used = DeclBits.getNextBit();

+ IsDeclMarkedUsed |= D->Used;

+ D->setAccess((AccessSpecifier)DeclBits.getNextBits(/*Width=*/2));

+ D->setImplicit(DeclBits.getNextBit());

bool HasStandaloneLexicalDC = DeclBits.getNextBit();

+ bool HasAttrs = DeclBits.getNextBit();

+ D->setTopLevelDeclInObjCContainer(DeclBits.getNextBit());

+ D->InvalidDecl = DeclBits.getNextBit();

+ D->FromASTFile = true;

if (D->isTemplateParameter() || D->isTemplateParameterPack() ||

isa<ParmVarDecl, ObjCTypeParamDecl>(D)) {

@@ -623,20 +634,6 @@ void ASTDeclReader::VisitDecl(Decl *D) {

}

D->setLocation(ThisDeclLoc);

- D->InvalidDecl = DeclBits.getNextBit();

- bool HasAttrs = DeclBits.getNextBit();

- D->setImplicit(DeclBits.getNextBit());

- D->Used = DeclBits.getNextBit();

- IsDeclMarkedUsed |= D->Used;

- D->setReferenced(DeclBits.getNextBit());

- D->setTopLevelDeclInObjCContainer(DeclBits.getNextBit());

- D->setAccess((AccessSpecifier)DeclBits.getNextBits(/*Width=*/2));

- D->FromASTFile = true;

- auto ModuleOwnership =

- (Decl::ModuleOwnershipKind)DeclBits.getNextBits(/*Width=*/3);

- bool ModulePrivate =

- (ModuleOwnership == Decl::ModuleOwnershipKind::ModulePrivate);

if (HasAttrs) {

AttrVec Attrs;

Record.readAttributes(Attrs);

@@ -647,8 +644,9 @@ void ASTDeclReader::VisitDecl(Decl *D) {

// Determine whether this declaration is part of a (sub)module. If so, it

// may not yet be visible.

+ bool ModulePrivate =

+ (ModuleOwnership == Decl::ModuleOwnershipKind::ModulePrivate);

if (unsigned SubmoduleID = readSubmoduleID()) {

switch (ModuleOwnership) {

case Decl::ModuleOwnershipKind::Visible:

ModuleOwnership = Decl::ModuleOwnershipKind::VisibleWhenImported;

@@ -1065,9 +1063,11 @@ void ASTDeclReader::VisitFunctionDecl(FunctionDecl *FD) {

// after everything else is read.

BitsUnpacker FunctionDeclBits(Record.readInt());

+ FD->setCachedLinkage((Linkage)FunctionDeclBits.getNextBits(/*Width=*/3));

FD->setStorageClass((StorageClass)FunctionDeclBits.getNextBits(/*Width=*/3));

FD->setInlineSpecified(FunctionDeclBits.getNextBit());

FD->setImplicitlyInline(FunctionDeclBits.getNextBit());

+ FD->setHasSkippedBody(FunctionDeclBits.getNextBit());

FD->setVirtualAsWritten(FunctionDeclBits.getNextBit());

// We defer calling `FunctionDecl::setPure()` here as for methods of

// `CXXTemplateSpecializationDecl`s, we may not have connected up the

@@ -1081,16 +1081,14 @@ void ASTDeclReader::VisitFunctionDecl(FunctionDecl *FD) {

FD->setDefaulted(FunctionDeclBits.getNextBit());

FD->setExplicitlyDefaulted(FunctionDeclBits.getNextBit());

FD->setIneligibleOrNotSelected(FunctionDeclBits.getNextBit());

- FD->setHasImplicitReturnZero(FunctionDeclBits.getNextBit());

FD->setConstexprKind(

(ConstexprSpecKind)FunctionDeclBits.getNextBits(/*Width=*/2));

- FD->setUsesSEHTry(FunctionDeclBits.getNextBit());

- FD->setHasSkippedBody(FunctionDeclBits.getNextBit());

+ FD->setHasImplicitReturnZero(FunctionDeclBits.getNextBit());

FD->setIsMultiVersion(FunctionDeclBits.getNextBit());

FD->setLateTemplateParsed(FunctionDeclBits.getNextBit());

FD->setFriendConstraintRefersToEnclosingTemplate(

FunctionDeclBits.getNextBit());

- FD->setCachedLinkage((Linkage)FunctionDeclBits.getNextBits(/*Width=*/3));

+ FD->setUsesSEHTry(FunctionDeclBits.getNextBit());

FD->EndRangeLoc = readSourceLocation();

if (FD->isExplicitlyDefaulted())

@@ -1597,6 +1595,8 @@ ASTDeclReader::RedeclarableResult ASTDeclReader::VisitVarDeclImpl(VarDecl *VD) {

VisitDeclaratorDecl(VD);

BitsUnpacker VarDeclBits(Record.readInt());

+ auto VarLinkage = Linkage(VarDeclBits.getNextBits(/*Width=*/3));

+ bool DefGeneratedInModule = VarDeclBits.getNextBit();

VD->VarDeclBits.SClass = (StorageClass)VarDeclBits.getNextBits(/*Width=*/3);

VD->VarDeclBits.TSCSpec = VarDeclBits.getNextBits(/*Width=*/2);

VD->VarDeclBits.InitStyle = VarDeclBits.getNextBits(/*Width=*/2);

@@ -1608,17 +1608,20 @@ ASTDeclReader::RedeclarableResult ASTDeclReader::VisitVarDeclImpl(VarDecl *VD) {

VD->NonParmVarDeclBits.ExceptionVar = VarDeclBits.getNextBit();

VD->NonParmVarDeclBits.NRVOVariable = VarDeclBits.getNextBit();

VD->NonParmVarDeclBits.CXXForRangeDecl = VarDeclBits.getNextBit();

- VD->NonParmVarDeclBits.ObjCForDecl = VarDeclBits.getNextBit();

VD->NonParmVarDeclBits.IsInline = VarDeclBits.getNextBit();

VD->NonParmVarDeclBits.IsInlineSpecified = VarDeclBits.getNextBit();

VD->NonParmVarDeclBits.IsConstexpr = VarDeclBits.getNextBit();

VD->NonParmVarDeclBits.IsInitCapture = VarDeclBits.getNextBit();

VD->NonParmVarDeclBits.PreviousDeclInSameBlockScope =

VarDeclBits.getNextBit();

- VD->NonParmVarDeclBits.ImplicitParamKind =

- VarDeclBits.getNextBits(/*Width*/ 3);

VD->NonParmVarDeclBits.EscapingByref = VarDeclBits.getNextBit();

HasDeducedType = VarDeclBits.getNextBit();

+ VD->NonParmVarDeclBits.ImplicitParamKind =

+ VarDeclBits.getNextBits(/*Width*/ 3);

+ VD->NonParmVarDeclBits.ObjCForDecl = VarDeclBits.getNextBit();

}

// If this variable has a deduced type, defer reading that type until we are

@@ -1630,7 +1633,6 @@ ASTDeclReader::RedeclarableResult ASTDeclReader::VisitVarDeclImpl(VarDecl *VD) {

VD->setType(Reader.GetType(DeferredTypeID));

DeferredTypeID = 0;

- auto VarLinkage = Linkage(VarDeclBits.getNextBits(/*Width=*/3));

VD->setCachedLinkage(VarLinkage);

// Reconstruct the one piece of the IdentifierNamespace that we need.

@@ -1638,7 +1640,7 @@ ASTDeclReader::RedeclarableResult ASTDeclReader::VisitVarDeclImpl(VarDecl *VD) {

VD->getLexicalDeclContext()->isFunctionOrMethod())

VD->setLocalExternDecl();

- if (VarDeclBits.getNextBit()) {

+ if (DefGeneratedInModule) {

Reader.DefinitionSource[VD] =

Loc.F->Kind == ModuleKind::MK_MainFile ||

Reader.getContext().getLangOpts().BuildingPCHWithObjectFile;

@@ -2660,7 +2662,7 @@ void ASTDeclReader::VisitTemplateTypeParmDecl(TemplateTypeParmDecl *D) {

D->setDeclaredWithTypename(Record.readInt());

- if (Record.readBool()) {

+ if (D->hasTypeConstraint()) {

ConceptReference *CR = nullptr;

if (Record.readBool())

CR = Record.readConceptReference();