https://github.com/jevinskie created
https://github.com/llvm/llvm-project/pull/69899
Yowza, I haven't tried to upstream anything to LLVM in a long time. It was so
long ago I just had my coworker submit it for me with their SVN access...
Anyways, this adds `ObjCBridgeAttr`, `ObjCBridgeMutableAttr`, and
`ObjCBridgeRelatedAttr` attributes to C-Index (c-index? C-index?). Truth be
told, I just wanted a way to figure out that a `SecKeyRef` parameter in a
header was usable as an Obj-C object.
Now `c-index-test -test-print-type -Xclang -triple -Xclang
arm64-apple-ios17.0.0 -x objective-c ./objc-bridge-attr-test.h` prints:
```
<pre-defined macro definition spam>
...
ObjCClassRef=Protocol:0:0 [type=Protocol] [typekind=ObjCInterface] [isPOD=0]
[isAnonRecDecl=0]
StructDecl=__SecKey:3:60 [type=struct __SecKey] [typekind=Record] [isPOD=0]
[isAnonRecDecl=0]
attribute(packed)=packed [type=] [typekind=Invalid] [isPOD=0] [isAnonRecDecl=0]
ObjCBridgeAttr= [type=] [typekind=Invalid] [isPOD=0] [isAnonRecDecl=0]
TypedefDecl=SecKeyRef:3:70 (Definition) [type=SecKeyRef] [typekind=Typedef]
[canonicaltype=struct __SecKey *] [canonicaltypekind=Pointer] [isPOD=1]
[isAnonRecDecl=0]
TypeRef=struct __SecKey:3:60 [type=struct __SecKey] [typekind=Record] [isPOD=0]
[isAnonRecDecl=0]
FunctionDecl=i_take_a_key:5:12 [type=int (SecKeyRef)] [typekind=FunctionProto]
[canonicaltype=int (struct __SecKey *)] [canonicaltypekind=FunctionProto]
[resulttype=int] [resulttypekind=Int] [args= [SecKeyRef] [Elaborated]]
[isPOD=0] [isAnonRecDecl=0]
ParmDecl=my_key:5:35 (Definition) [type=SecKeyRef] [typekind=Elaborated]
[canonicaltype=struct __SecKey *] [canonicaltypekind=Pointer] [isPOD=1]
[isAnonRecDecl=0]
TypeRef=SecKeyRef:3:70 [type=SecKeyRef] [typekind=Typedef]
[canonicaltype=struct __SecKey *] [canonicaltypekind=Pointer] [isPOD=1]
[isAnonRecDecl=0]
```
with `objc-bridge-attr-test.h`:
```
#define CF_BRIDGED_TYPE(T) __attribute__((objc_bridge(T)))
typedef struct __attribute__((packed)) CF_BRIDGED_TYPE(id) __SecKey *SecKeyRef;
extern int i_take_a_key(SecKeyRef my_key);
```
(That is not the true typedef of `SecKeyRef`, I just threw another, already
supported, `__attribute__((packed))` in there for testing.)
Speaking of testing, do all new `CXCursorKind` enums need unit tests written
for them?
Thanks and long live the Dragon.
>From 824d7a8caf8eae241bb0cad47e15b99da05125be Mon Sep 17 00:00:00 2001
From: Jevin Sweval <jevinswe...@gmail.com>
Date: Mon, 23 Oct 2023 02:45:22 -0400
Subject: [PATCH] Add Obj-C bridging-related attributes to C-Index API
---
clang/include/clang-c/Index.h | 5 ++++-
clang/tools/libclang/CIndex.cpp | 6 ++++++
clang/tools/libclang/CXCursor.cpp | 6 ++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/clang/include/clang-c/Index.h b/clang/include/clang-c/Index.h
index 64ab3378957c702..dd9912ee55f532e 100644
--- a/clang/include/clang-c/Index.h
+++ b/clang/include/clang-c/Index.h
@@ -2199,7 +2199,10 @@ enum CXCursorKind {
CXCursor_WarnUnusedAttr = 439,
CXCursor_WarnUnusedResultAttr = 440,
CXCursor_AlignedAttr = 441,
- CXCursor_LastAttr = CXCursor_AlignedAttr,
+ CXCursor_ObjCBridgeAttr = 442,
+ CXCursor_ObjCBridgeMutableAttr = 443,
+ CXCursor_ObjCBridgeRelatedAttr = 444,
+ CXCursor_LastAttr = CXCursor_ObjCBridgeRelatedAttr,
/* Preprocessing */
CXCursor_PreprocessingDirective = 500,
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index 46226f4325b0a7a..89136adcc5cc14d 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/tools/libclang/CIndex.cpp
@@ -6097,6 +6097,12 @@ CXString clang_getCursorKindSpelling(enum CXCursorKind
Kind) {
return cxstring::createRef("attribute(aligned)");
case CXCursor_ConceptDecl:
return cxstring::createRef("ConceptDecl");
+ case CXCursor_ObjCBridgeAttr:
+ return cxstring::createRef("ObjCBridgeAttr");
+ case CXCursor_ObjCBridgeMutableAttr:
+ return cxstring::createRef("ObjCBridgeMutableAttr");
+ case CXCursor_ObjCBridgeRelatedAttr:
+ return cxstring::createRef("ObjCBridgeRelatedAttr");
}
llvm_unreachable("Unhandled CXCursorKind");
diff --git a/clang/tools/libclang/CXCursor.cpp
b/clang/tools/libclang/CXCursor.cpp
index fd03c48ba1a42aa..f13448c8c6cd553 100644
--- a/clang/tools/libclang/CXCursor.cpp
+++ b/clang/tools/libclang/CXCursor.cpp
@@ -124,6 +124,12 @@ static CXCursorKind GetCursorKind(const Attr *A) {
return CXCursor_WarnUnusedResultAttr;
case attr::Aligned:
return CXCursor_AlignedAttr;
+ case attr::ObjCBridge:
+ return CXCursor_ObjCBridgeAttr;
+ case attr::ObjCBridgeMutable:
+ return CXCursor_ObjCBridgeMutableAttr;
+ case attr::ObjCBridgeRelated:
+ return CXCursor_ObjCBridgeRelatedAttr;
}
return CXCursor_UnexposedAttr;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
