Vendor import of llvm-project branch release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6, a.k.a. 19.1.2 release. - src

diff options


context:
space:
mode:

author	Dimitry Andric <dim@FreeBSD.org>	2024-10-21 11:01:02 +0000
committer	Dimitry Andric <dim@FreeBSD.org>	2024-10-21 11:01:02 +0000
commit	e6b732792813cf49a23ba2f780c55f8d3279183e (patch)
tree	95a0ed209e2fb21f748e1151d801664be5790a8d /clang/lib/CodeGen
parent	0370629593a68f2e04a9710d201d120a2ce437d4 (diff)

Vendor import of llvm-project branch release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6, a.k.a. 19.1.2 release.vendor/llvm-project/llvmorg-19.1.2-0-g7ba7d8e2f7b6

Diffstat (limited to 'clang/lib/CodeGen')

-rw-r--r--

clang/lib/CodeGen/CGCall.cpp

-rw-r--r--

clang/lib/CodeGen/CGClass.cpp

-rw-r--r--

clang/lib/CodeGen/CGExpr.cpp

-rw-r--r--

clang/lib/CodeGen/CodeGenModule.cpp

-rw-r--r--

clang/lib/CodeGen/CodeGenModule.h

-rw-r--r--

clang/lib/CodeGen/CodeGenTBAA.cpp

-rw-r--r--

clang/lib/CodeGen/CodeGenTBAA.h

-rw-r--r--

clang/lib/CodeGen/CodeGenTypes.cpp

-rw-r--r--

clang/lib/CodeGen/CodeGenTypes.h

-rw-r--r--

clang/lib/CodeGen/MicrosoftCXXABI.cpp

10 files changed, 50 insertions, 54 deletions

diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index d7ebffa8c5e4..0416fa03d749 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp

@@ -314,7 +314,8 @@ CodeGenTypes::arrangeCXXMethodDeclaration(const CXXMethodDecl *MD) {

if (MD->isImplicitObjectMemberFunction()) {

// The abstract case is perfectly fine.

- const CXXRecordDecl *ThisType = TheCXXABI.getThisArgumentTypeForMethod(MD);

+ const CXXRecordDecl *ThisType =

+ getCXXABI().getThisArgumentTypeForMethod(MD);

return arrangeCXXMethodType(ThisType, prototype.getTypePtr(), MD);

}

@@ -337,7 +338,7 @@ CodeGenTypes::arrangeCXXStructorDeclaration(GlobalDecl GD) {

SmallVector<CanQualType, 16> argTypes;

SmallVector<FunctionProtoType::ExtParameterInfo, 16> paramInfos;

- const CXXRecordDecl *ThisType = TheCXXABI.getThisArgumentTypeForMethod(GD);

+ const CXXRecordDecl *ThisType = getCXXABI().getThisArgumentTypeForMethod(GD);

argTypes.push_back(DeriveThisType(ThisType, MD));

bool PassParams = true;

@@ -356,7 +357,7 @@ CodeGenTypes::arrangeCXXStructorDeclaration(GlobalDecl GD) {

appendParameterTypes(*this, argTypes, paramInfos, FTP);

CGCXXABI::AddedStructorArgCounts AddedArgs =

- TheCXXABI.buildStructorSignature(GD, argTypes);

+ getCXXABI().buildStructorSignature(GD, argTypes);

if (!paramInfos.empty()) {

// Note: prefix implies after the first param.

if (AddedArgs.Prefix)

@@ -372,11 +373,10 @@ CodeGenTypes::arrangeCXXStructorDeclaration(GlobalDecl GD) {

: RequiredArgs::All);

FunctionType::ExtInfo extInfo = FTP->getExtInfo();

- CanQualType resultType = TheCXXABI.HasThisReturn(GD)

- ? argTypes.front()

- : TheCXXABI.hasMostDerivedReturn(GD)

- ? CGM.getContext().VoidPtrTy

- : Context.VoidTy;

+ CanQualType resultType = getCXXABI().HasThisReturn(GD) ? argTypes.front()

+ : getCXXABI().hasMostDerivedReturn(GD)

+ ? CGM.getContext().VoidPtrTy

+ : Context.VoidTy;

return arrangeLLVMFunctionInfo(resultType, FnInfoOpts::IsInstanceMethod,

argTypes, extInfo, paramInfos, required);

}

@@ -437,11 +437,10 @@ CodeGenTypes::arrangeCXXConstructorCall(const CallArgList &args,

: RequiredArgs::All;

GlobalDecl GD(D, CtorKind);

- CanQualType ResultType = TheCXXABI.HasThisReturn(GD)

- ? ArgTypes.front()

- : TheCXXABI.hasMostDerivedReturn(GD)

- ? CGM.getContext().VoidPtrTy

- : Context.VoidTy;

+ CanQualType ResultType = getCXXABI().HasThisReturn(GD) ? ArgTypes.front()

+ : getCXXABI().hasMostDerivedReturn(GD)

+ ? CGM.getContext().VoidPtrTy

+ : Context.VoidTy;

FunctionType::ExtInfo Info = FPT->getExtInfo();

llvm::SmallVector<FunctionProtoType::ExtParameterInfo, 16> ParamInfos;

@@ -806,7 +805,7 @@ const CGFunctionInfo &CodeGenTypes::arrangeLLVMFunctionInfo(

} else if (info.getCC() == CC_Swift || info.getCC() == CC_SwiftAsync) {

swiftcall::computeABIInfo(CGM, *FI);

} else {

- getABIInfo().computeInfo(*FI);

+ CGM.getABIInfo().computeInfo(*FI);

}

// Loop over all of the computed argument and return value info. If any of

@@ -6022,6 +6021,6 @@ RValue CodeGenFunction::EmitVAArg(VAArgExpr *VE, Address &VAListAddr,

: EmitVAListRef(VE->getSubExpr());

QualType Ty = VE->getType();

if (VE->isMicrosoftABI())

- return CGM.getTypes().getABIInfo().EmitMSVAArg(*this, VAListAddr, Ty, Slot);

- return CGM.getTypes().getABIInfo().EmitVAArg(*this, VAListAddr, Ty, Slot);

+ return CGM.getABIInfo().EmitMSVAArg(*this, VAListAddr, Ty, Slot);

+ return CGM.getABIInfo().EmitVAArg(*this, VAListAddr, Ty, Slot);

}

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 667e260f2228..e5ba50de3462 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp

@@ -209,7 +209,7 @@ CodeGenModule::GetNonVirtualBaseClassOffset(const CXXRecordDecl *ClassDecl,

return nullptr;

llvm::Type *PtrDiffTy =

- Types.ConvertType(getContext().getPointerDiffType());

+ getTypes().ConvertType(getContext().getPointerDiffType());

return llvm::ConstantInt::get(PtrDiffTy, Offset.getQuantity());

}

diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 5f58a64d8386..3ef22b17f769 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp

@@ -1052,6 +1052,8 @@ public:

return Visit(E->getBase());

}

const Expr *VisitCastExpr(const CastExpr *E) {

+ if (E->getCastKind() == CK_LValueToRValue)

+ return IsExpectedRecordDecl(E) ? E : nullptr;

return Visit(E->getSubExpr());

}

const Expr *VisitParenExpr(const ParenExpr *E) {

@@ -1119,19 +1121,15 @@ llvm::Value *CodeGenFunction::EmitCountedByFieldExpr(

return nullptr;

llvm::Value *Res = nullptr;

- if (const auto *DRE = dyn_cast<DeclRefExpr>(StructBase)) {

- Res = EmitDeclRefLValue(DRE).getPointer(*this);

- Res = Builder.CreateAlignedLoad(ConvertType(DRE->getType()), Res,

- getPointerAlign(), "dre.load");

- } else if (const MemberExpr *ME = dyn_cast<MemberExpr>(StructBase)) {

- LValue LV = EmitMemberExpr(ME);

- Address Addr = LV.getAddress();

- Res = Addr.emitRawPointer(*this);

- } else if (StructBase->getType()->isPointerType()) {

+ if (StructBase->getType()->isPointerType()) {

LValueBaseInfo BaseInfo;

TBAAAccessInfo TBAAInfo;

Address Addr = EmitPointerWithAlignment(StructBase, &BaseInfo, &TBAAInfo);

Res = Addr.emitRawPointer(*this);

+ } else if (StructBase->isLValue()) {

+ LValue LV = EmitLValue(StructBase);

+ Address Addr = LV.getAddress();

+ Res = Addr.emitRawPointer(*this);

} else {

return nullptr;

}

diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 63ed5b4dd0c3..cf5e29e5a3db 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp

@@ -343,10 +343,11 @@ CodeGenModule::CodeGenModule(ASTContext &C,

: Context(C), LangOpts(C.getLangOpts()), FS(FS), HeaderSearchOpts(HSO),

PreprocessorOpts(PPO), CodeGenOpts(CGO), TheModule(M), Diags(diags),

Target(C.getTargetInfo()), ABI(createCXXABI(*this)),

- VMContext(M.getContext()), Types(*this), VTables(*this),

+ VMContext(M.getContext()), VTables(*this),

SanitizerMD(new SanitizerMetadata(*this)) {

// Initialize the type cache.

+ Types.reset(new CodeGenTypes(*this));

llvm::LLVMContext &LLVMContext = M.getContext();

VoidTy = llvm::Type::getVoidTy(LLVMContext);

Int8Ty = llvm::Type::getInt8Ty(LLVMContext);

@@ -405,7 +406,7 @@ CodeGenModule::CodeGenModule(ASTContext &C,

if (LangOpts.Sanitize.has(SanitizerKind::Thread) ||

(!CodeGenOpts.RelaxedAliasing && CodeGenOpts.OptimizationLevel > 0))

TBAA.reset(new CodeGenTBAA(Context, getTypes(), TheModule, CodeGenOpts,

- getLangOpts(), getCXXABI().getMangleContext()));

+ getLangOpts()));

// If debug info or coverage generation is enabled, create the CGDebugInfo

// object.

@@ -1452,12 +1453,12 @@ void CodeGenModule::EmitBackendOptionsMetadata(

void CodeGenModule::UpdateCompletedType(const TagDecl *TD) {

// Make sure that this type is translated.

- Types.UpdateCompletedType(TD);

+ getTypes().UpdateCompletedType(TD);

}

void CodeGenModule::RefreshTypeCacheForClass(const CXXRecordDecl *RD) {

// Make sure that this type is translated.

- Types.RefreshTypeCacheForClass(RD);

+ getTypes().RefreshTypeCacheForClass(RD);

}

llvm::MDNode *CodeGenModule::getTBAATypeInfo(QualType QTy) {

@@ -5376,6 +5377,10 @@ void CodeGenModule::maybeSetTrivialComdat(const Decl &D,

GO.setComdat(TheModule.getOrInsertComdat(GO.getName()));

}

+const ABIInfo &CodeGenModule::getABIInfo() {

+ return getTargetCodeGenInfo().getABIInfo();

/// Pass IsTentative as true if you want to create a tentative definition.

void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D,

bool IsTentative) {

@@ -7784,7 +7789,5 @@ void CodeGenModule::moveLazyEmissionStates(CodeGenModule *NewBuilder) {

NewBuilder->WeakRefReferences = std::move(WeakRefReferences);

- NewBuilder->TBAA = std::move(TBAA);

NewBuilder->ABI->MangleCtx = std::move(ABI->MangleCtx);

}

diff --git a/clang/lib/CodeGen/CodeGenModule.h b/clang/lib/CodeGen/CodeGenModule.h
index 284bba823bae..c58bb88035ca 100644
--- a/clang/lib/CodeGen/CodeGenModule.h
+++ b/clang/lib/CodeGen/CodeGenModule.h

@@ -320,7 +320,7 @@ private:

// This should not be moved earlier, since its initialization depends on some

// of the previous reference members being already initialized and also checks

// if TheTargetCodeGenInfo is NULL

- CodeGenTypes Types;

+ std::unique_ptr<CodeGenTypes> Types;

/// Holds information about C++ vtables.

CodeGenVTables VTables;

@@ -776,6 +776,7 @@ public:

bool supportsCOMDAT() const;

void maybeSetTrivialComdat(const Decl &D, llvm::GlobalObject &GO);

+ const ABIInfo &getABIInfo();

CGCXXABI &getCXXABI() const { return *ABI; }

llvm::LLVMContext &getLLVMContext() { return VMContext; }

@@ -783,7 +784,7 @@ public:

const TargetCodeGenInfo &getTargetCodeGenInfo();

- CodeGenTypes &getTypes() { return Types; }

+ CodeGenTypes &getTypes() { return *Types; }

CodeGenVTables &getVTables() { return VTables; }

diff --git a/clang/lib/CodeGen/CodeGenTBAA.cpp b/clang/lib/CodeGen/CodeGenTBAA.cpp
index b66b6234c9d3..2ce558d4bdf3 100644
--- a/clang/lib/CodeGen/CodeGenTBAA.cpp
+++ b/clang/lib/CodeGen/CodeGenTBAA.cpp

@@ -16,6 +16,7 @@

#include "CodeGenTBAA.h"

#include "ABIInfoImpl.h"

+#include "CGCXXABI.h"

#include "CGRecordLayout.h"

#include "CodeGenTypes.h"

#include "clang/AST/ASTContext.h"

@@ -36,10 +37,10 @@ using namespace CodeGen;

CodeGenTBAA::CodeGenTBAA(ASTContext &Ctx, CodeGenTypes &CGTypes,

llvm::Module &M, const CodeGenOptions &CGO,

- const LangOptions &Features, MangleContext &MContext)

+ const LangOptions &Features)

: Context(Ctx), CGTypes(CGTypes), Module(M), CodeGenOpts(CGO),

- Features(Features), MContext(MContext), MDHelper(M.getContext()),

- Root(nullptr), Char(nullptr) {}

+ Features(Features), MDHelper(M.getContext()), Root(nullptr),

+ Char(nullptr) {}

CodeGenTBAA::~CodeGenTBAA() {

}

@@ -256,7 +257,8 @@ llvm::MDNode *CodeGenTBAA::getTypeInfoHelper(const Type *Ty) {

SmallString<256> OutName;

llvm::raw_svector_ostream Out(OutName);

- MContext.mangleCanonicalTypeName(QualType(ETy, 0), Out);

+ CGTypes.getCXXABI().getMangleContext().mangleCanonicalTypeName(

+ QualType(ETy, 0), Out);

return createScalarTypeNode(OutName, getChar(), Size);

}

@@ -481,7 +483,8 @@ llvm::MDNode *CodeGenTBAA::getBaseTypeInfoHelper(const Type *Ty) {

if (Features.CPlusPlus) {

// Don't use the mangler for C code.

llvm::raw_svector_ostream Out(OutName);

- MContext.mangleCanonicalTypeName(QualType(Ty, 0), Out);

+ CGTypes.getCXXABI().getMangleContext().mangleCanonicalTypeName(

+ QualType(Ty, 0), Out);

} else {

OutName = RD->getName();

}

diff --git a/clang/lib/CodeGen/CodeGenTBAA.h b/clang/lib/CodeGen/CodeGenTBAA.h
index 5d9ecec3ff0f..ba74a39a4d25 100644
--- a/clang/lib/CodeGen/CodeGenTBAA.h
+++ b/clang/lib/CodeGen/CodeGenTBAA.h

@@ -24,7 +24,6 @@ namespace clang {

class ASTContext;

class CodeGenOptions;

class LangOptions;

- class MangleContext;

class QualType;

class Type;

@@ -120,7 +119,6 @@ class CodeGenTBAA {

llvm::Module &Module;

const CodeGenOptions &CodeGenOpts;

const LangOptions &Features;

- MangleContext &MContext;

// MDHelper - Helper for creating metadata.

llvm::MDBuilder MDHelper;

@@ -174,8 +172,7 @@ class CodeGenTBAA {

public:

CodeGenTBAA(ASTContext &Ctx, CodeGenTypes &CGTypes, llvm::Module &M,

- const CodeGenOptions &CGO, const LangOptions &Features,

- MangleContext &MContext);

+ const CodeGenOptions &CGO, const LangOptions &Features);

~CodeGenTBAA();

/// getTypeInfo - Get metadata used to describe accesses to objects of the

diff --git a/clang/lib/CodeGen/CodeGenTypes.cpp b/clang/lib/CodeGen/CodeGenTypes.cpp
index e0f567c5da34..f5deccdc1ba7 100644
--- a/clang/lib/CodeGen/CodeGenTypes.cpp
+++ b/clang/lib/CodeGen/CodeGenTypes.cpp

@@ -30,9 +30,8 @@ using namespace clang;

using namespace CodeGen;

CodeGenTypes::CodeGenTypes(CodeGenModule &cgm)

- : CGM(cgm), Context(cgm.getContext()), TheModule(cgm.getModule()),

- Target(cgm.getTarget()), TheCXXABI(cgm.getCXXABI()),

- TheABIInfo(cgm.getTargetCodeGenInfo().getABIInfo()) {

+ : CGM(cgm), Context(cgm.getContext()), TheModule(cgm.getModule()),

+ Target(cgm.getTarget()) {

SkippedLayout = false;

LongDoubleReferenced = false;

}

@@ -43,6 +42,8 @@ CodeGenTypes::~CodeGenTypes() {

delete &*I++;

}

+CGCXXABI &CodeGenTypes::getCXXABI() const { return getCGM().getCXXABI(); }

const CodeGenOptions &CodeGenTypes::getCodeGenOpts() const {

return CGM.getCodeGenOpts();

}

diff --git a/clang/lib/CodeGen/CodeGenTypes.h b/clang/lib/CodeGen/CodeGenTypes.h
index cbda2628e914..5aebf9a21223 100644
--- a/clang/lib/CodeGen/CodeGenTypes.h
+++ b/clang/lib/CodeGen/CodeGenTypes.h

@@ -57,11 +57,6 @@ class CodeGenTypes {

ASTContext &Context;

llvm::Module &TheModule;

const TargetInfo &Target;

- CGCXXABI &TheCXXABI;

- // This should not be moved earlier, since its initialization depends on some

- // of the previous reference members being already initialized

- const ABIInfo &TheABIInfo;

/// The opaque type map for Objective-C interfaces. All direct

/// manipulation is done by the runtime interfaces, which are

@@ -106,9 +101,8 @@ public:

}

CodeGenModule &getCGM() const { return CGM; }

ASTContext &getContext() const { return Context; }

- const ABIInfo &getABIInfo() const { return TheABIInfo; }

const TargetInfo &getTarget() const { return Target; }

- CGCXXABI &getCXXABI() const { return TheCXXABI; }

+ CGCXXABI &getCXXABI() const;

llvm::LLVMContext &getLLVMContext() { return TheModule.getContext(); }

const CodeGenOptions &getCodeGenOpts() const;

diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
index cc6740edabcd..76d0191a7e63 100644
--- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp
+++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp

@@ -1111,7 +1111,7 @@ static bool isTrivialForMSVC(const CXXRecordDecl *RD, QualType Ty,

const Type *Base = nullptr;

uint64_t NumElts = 0;

if (CGM.getTarget().getTriple().isAArch64() &&

- CGM.getTypes().getABIInfo().isHomogeneousAggregate(Ty, Base, NumElts) &&

+ CGM.getABIInfo().isHomogeneousAggregate(Ty, Base, NumElts) &&

isa<VectorType>(Base)) {

return true;

}