[clang] [ObjC] Recursively check superclasses to see if any inherit from NSObject (PR #81335)
via cfe-commits
cfe-commits at lists.llvm.org
Fri Feb 9 15:17:26 PST 2024
https://github.com/AtariDreams updated https://github.com/llvm/llvm-project/pull/81335
>From 13611985a4879ecb43daaf336f7ecfa8d13514db Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams at users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:51:15 -0500
Subject: [PATCH 1/2] [ObjC] Add pre-commit tests [NFC]
---
.../CodeGenObjC/constant-non-fragile-ivar-offset.m | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/clang/test/CodeGenObjC/constant-non-fragile-ivar-offset.m b/clang/test/CodeGenObjC/constant-non-fragile-ivar-offset.m
index 788b3220af3067..2eadcfcc147855 100644
--- a/clang/test/CodeGenObjC/constant-non-fragile-ivar-offset.m
+++ b/clang/test/CodeGenObjC/constant-non-fragile-ivar-offset.m
@@ -2,6 +2,7 @@
// CHECK: @"OBJC_IVAR_$_StaticLayout.static_layout_ivar" = hidden constant i64 20
// CHECK: @"OBJC_IVAR_$_NotStaticLayout.not_static_layout_ivar" = hidden global i64 12
+// CHECK: @"OBJC_IVAR_$_StaticLayoutSubClass.static_layout_ivar2" = hidden global i64 24
@interface NSObject {
int these, will, never, change, ever;
@@ -20,6 +21,18 @@ -(void)meth {
}
@end
+ at interface StaticLayoutSubClass : StaticLayout
+ at end
+
+ at implementation StaticLayoutSubClass {
+ int static_layout_ivar2;
+}
+-(void)meth2 {
+ static_layout_ivar2 = 0;
+ // CHECK: load i64, ptr @"OBJC_IVAR_$_StaticLayoutSubClass.static_layout_ivar2
+}
+ at end
+
@interface NotNSObject {
int these, might, change;
}
>From 16d3865e2029b686039b9e2c57b7a3efa2b25022 Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams at users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:47:59 -0500
Subject: [PATCH 2/2] [ObjC] Recursively check superclasses to see if any
inherit from NSObject
If an NSObject subclass has fixed offsets, then so must the subclasses of that subclass!
---
clang/lib/CodeGen/CGObjCMac.cpp | 17 ++++++++++++-----
.../constant-non-fragile-ivar-offset.m | 2 +-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp
index 27d77e9a8a5511..ec4d432b8abf2b 100644
--- a/clang/lib/CodeGen/CGObjCMac.cpp
+++ b/clang/lib/CodeGen/CGObjCMac.cpp
@@ -1593,12 +1593,19 @@ class CGObjCNonFragileABIMac : public CGObjCCommonMac {
}
bool isClassLayoutKnownStatically(const ObjCInterfaceDecl *ID) {
+ if (!ID)
+ return false;
+
+ if (ID->getName() == "NSObject")
+ return true;
+
// NSObject is a fixed size. If we can see the @implementation of a class
- // which inherits from NSObject then we know that all it's offsets also must
- // be fixed. FIXME: Can we do this if see a chain of super classes with
- // implementations leading to NSObject?
- return ID->getImplementation() && ID->getSuperClass() &&
- ID->getSuperClass()->getName() == "NSObject";
+ // which inherits from NSObject, then we know that all its offsets must
+ // be fixed.
+
+ // Check recursively for all intermediate superclasses.
+ return ID->getImplementation() &&
+ isClassLayoutKnownStatically(ID->getSuperClass());
}
public:
diff --git a/clang/test/CodeGenObjC/constant-non-fragile-ivar-offset.m b/clang/test/CodeGenObjC/constant-non-fragile-ivar-offset.m
index 2eadcfcc147855..4701f1c5c9b93f 100644
--- a/clang/test/CodeGenObjC/constant-non-fragile-ivar-offset.m
+++ b/clang/test/CodeGenObjC/constant-non-fragile-ivar-offset.m
@@ -29,7 +29,7 @@ @implementation StaticLayoutSubClass {
}
-(void)meth2 {
static_layout_ivar2 = 0;
- // CHECK: load i64, ptr @"OBJC_IVAR_$_StaticLayoutSubClass.static_layout_ivar2
+ // CHECK-NOT: load i64, ptr @"OBJC_IVAR_$_StaticLayoutSubClass.static_layout_ivar2
}
@end
More information about the cfe-commits
mailing list