Skip to content

[BPF] Fix issues with external declarations of C++ structor decls #137079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 24, 2025
Merged

[BPF] Fix issues with external declarations of C++ structor decls #137079

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e78b801
[BPF] Fix issues with external declarations of C++ structor decls
rnk Apr 23, 2025
a4e45e8
Uniform var / fn handling
rnk Apr 23, 2025
d31c0e0
pacify formatter check
rnk Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Uniform var / fn handling
  • Loading branch information
@rnk
rnk committed Apr 23, 2025
commit a4e45e8f0c1f736da18c07c095395cf300d1849c
60 changes: 26 additions & 34 deletions clang/lib/CodeGen/CodeGenModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5378,11 +5378,33 @@ void CodeGenModule::EmitTentativeDefinition(const VarDecl *D) {
EmitGlobalVarDefinition(D);
}

// Return a GlobalDecl. Use the base variants for destructors and constructors.
static GlobalDecl getBaseVariantGlobalDecl(const NamedDecl *D) {
if (auto const *CD = dyn_cast<const CXXConstructorDecl>(D))
return GlobalDecl(CD, CXXCtorType::Ctor_Base);
else if (auto const *DD = dyn_cast<const CXXDestructorDecl>(D))
return GlobalDecl(DD, CXXDtorType::Dtor_Base);
return GlobalDecl(D);
}

void CodeGenModule::EmitExternalDeclaration(const DeclaratorDecl *D) {
if (auto const *V = dyn_cast<const VarDecl>(D))
EmitExternalVarDeclaration(V);
if (auto const *FD = dyn_cast<const FunctionDecl>(D))
EmitExternalFunctionDeclaration(FD);
CGDebugInfo *DI = getModuleDebugInfo();
if (!DI || !getCodeGenOpts().hasReducedDebugInfo())
return;

GlobalDecl GD = getBaseVariantGlobalDecl(D);
if (!GD)
return;

llvm::Constant *Addr = GetAddrOfGlobal(GD)->stripPointerCasts();
if (const auto *VD = dyn_cast<VarDecl>(D)) {
DI->EmitExternalVariable(
cast<llvm::GlobalVariable>(Addr->stripPointerCasts()), VD);
} else if (const auto *FD = dyn_cast<FunctionDecl>(D)) {
llvm::Function *Fn = cast<llvm::Function>(Addr);
if (!Fn->getSubprogram())
DI->EmitFunctionDecl(GD, FD->getLocation(), FD->getType(), Fn);
}
}

CharUnits CodeGenModule::GetTargetTypeStoreSize(llvm::Type *Ty) const {
Expand Down Expand Up @@ -5825,36 +5847,6 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D,
DI->EmitGlobalVariable(GV, D);
}

void CodeGenModule::EmitExternalVarDeclaration(const VarDecl *D) {
if (CGDebugInfo *DI = getModuleDebugInfo())
if (getCodeGenOpts().hasReducedDebugInfo()) {
QualType ASTTy = D->getType();
llvm::Type *Ty = getTypes().ConvertTypeForMem(D->getType());
llvm::Constant *GV =
GetOrCreateLLVMGlobal(D->getName(), Ty, ASTTy.getAddressSpace(), D);
DI->EmitExternalVariable(
cast<llvm::GlobalVariable>(GV->stripPointerCasts()), D);
}
}

static GlobalDecl getBaseVariantGlobalDecl(const FunctionDecl *FD) {
if (auto const *CD = dyn_cast<const CXXConstructorDecl>(FD))
return GlobalDecl(CD, CXXCtorType::Ctor_Base);
else if (auto const *DD = dyn_cast<const CXXDestructorDecl>(FD))
return GlobalDecl(DD, CXXDtorType::Dtor_Base);
return GlobalDecl(FD);
}

void CodeGenModule::EmitExternalFunctionDeclaration(const FunctionDecl *FD) {
if (CGDebugInfo *DI = getModuleDebugInfo())
if (getCodeGenOpts().hasReducedDebugInfo()) {
GlobalDecl GD = getBaseVariantGlobalDecl(FD);
auto *Fn = cast<llvm::Function>(GetAddrOfGlobal(GD));
if (!Fn->getSubprogram())
DI->EmitFunctionDecl(GD, FD->getLocation(), FD->getType(), Fn);
}
}

static bool isVarDeclStrongDefinition(const ASTContext &Context,
CodeGenModule &CGM, const VarDecl *D,
bool NoCommon) {
Expand Down
2 changes: 0 additions & 2 deletions clang/lib/CodeGen/CodeGenModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1852,8 +1852,6 @@ class CodeGenModule : public CodeGenTypeCache {
void EmitMultiVersionFunctionDefinition(GlobalDecl GD, llvm::GlobalValue *GV);

void EmitGlobalVarDefinition(const VarDecl *D, bool IsTentative = false);
void EmitExternalVarDeclaration(const VarDecl *D);
void EmitExternalFunctionDeclaration(const FunctionDecl *D);
void EmitAliasDefinition(GlobalDecl GD);
void emitIFuncDefinition(GlobalDecl GD);
void emitCPUDispatchDefinition(GlobalDecl GD);
Expand Down
Loading