https://github.com/qmfrederik updated
https://github.com/llvm/llvm-project/pull/107604
>From 2b42d2048e27d30ad77a6793ae36a9b2204b4435 Mon Sep 17 00:00:00 2001
From: Frederik Carlier <frederik.carl...@keysight.com>
Date: Fri, 6 Sep 2024 11:54:59 +0000
Subject: [PATCH] Set dllimport on Objective C ivar offsets
This commit ensures that offsets for instance variables are marked with
`dllimport` if the interface to which they belong have this attribute.
---
clang/lib/CodeGen/CGObjCGNU.cpp | 11 +++++++++--
clang/test/CodeGenObjC/dllstorage.m | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/clang/lib/CodeGen/CGObjCGNU.cpp b/clang/lib/CodeGen/CGObjCGNU.cpp
index adc7cdbfded880..6280e9465ecba6 100644
--- a/clang/lib/CodeGen/CGObjCGNU.cpp
+++ b/clang/lib/CodeGen/CGObjCGNU.cpp
@@ -1699,11 +1699,18 @@ class CGObjCGNUstep2 : public CGObjCGNUstep {
llvm::Value *EmitIvarOffset(CodeGenFunction &CGF,
const ObjCInterfaceDecl *Interface,
const ObjCIvarDecl *Ivar) override {
- const std::string Name =
GetIVarOffsetVariableName(Ivar->getContainingInterface(), Ivar);
+ const ObjCInterfaceDecl *ContainingInterface =
+ Ivar->getContainingInterface();
+ const std::string Name =
+ GetIVarOffsetVariableName(ContainingInterface, Ivar);
llvm::GlobalVariable *IvarOffsetPointer = TheModule.getNamedGlobal(Name);
- if (!IvarOffsetPointer)
+ if (!IvarOffsetPointer) {
IvarOffsetPointer = new llvm::GlobalVariable(TheModule, IntTy, false,
llvm::GlobalValue::ExternalLinkage, nullptr, Name);
+ if (Ivar->getAccessControl() != ObjCIvarDecl::Private &&
+ Ivar->getAccessControl() != ObjCIvarDecl::Package)
+ CGM.setGVProperties(IvarOffsetPointer, ContainingInterface);
+ }
CharUnits Align = CGM.getIntAlign();
llvm::Value *Offset =
CGF.Builder.CreateAlignedLoad(IntTy, IvarOffsetPointer, Align);
diff --git a/clang/test/CodeGenObjC/dllstorage.m
b/clang/test/CodeGenObjC/dllstorage.m
index c94f4c9b5804d0..0801fb049f6b45 100644
--- a/clang/test/CodeGenObjC/dllstorage.m
+++ b/clang/test/CodeGenObjC/dllstorage.m
@@ -151,7 +151,7 @@ id f(Q *q) {
// CHECK-IR-DAG: @"OBJC_IVAR_$_M._ivar" = external dllimport global i32
-// CHECK-NF-DAG: @"__objc_ivar_offset_M._ivar.@" = external global i32
+// CHECK-NF-DAG: @"__objc_ivar_offset_M._ivar.@" = external dllimport global
i32
int g(void) {
@autoreleasepool {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
