Skip to content

[index] Add new symbol kinds for borrow and mutate accessors #11417

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 1 commit into from
Sep 15, 2025
Merged

[index] Add new symbol kinds for borrow and mutate accessors #11417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions clang/include/clang/Index/IndexSymbol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ enum class SymbolSubKind : uint8_t {
SwiftAssociatedType,
SwiftGenericTypeParam,
SwiftAccessorInit,
SwiftAccessorBorrow,
SwiftAccessorMutate,
};

typedef uint32_t SymbolPropertySet;
Expand Down
4 changes: 3 additions & 1 deletion clang/include/indexstore/indexstore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* INDEXSTORE_VERSION_MAJOR is intended for "major" source/ABI breaking changes.
*/
#define INDEXSTORE_VERSION_MAJOR 0
#define INDEXSTORE_VERSION_MINOR 15 /* added Swift init accessor sub-symbol */
#define INDEXSTORE_VERSION_MINOR 16 /* added Swift borrow and mutate accessor sub-symbol */

#define INDEXSTORE_VERSION_ENCODE(major, minor) ( \
((major) * 10000) \
Expand Down Expand Up @@ -314,6 +314,8 @@ typedef enum {
INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORREAD = 1014,
INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORMODIFY = 1015,
INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORINIT = 1016,
INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORBORROW = 1017,
INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORMUTATE = 1018,
} indexstore_symbol_subkind_t;

INDEXSTORE_OPTIONS(uint64_t, indexstore_symbol_property_t) {
Expand Down
4 changes: 4 additions & 0 deletions clang/lib/Index/IndexDataStoreUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ SymbolSubKind index::getSymbolSubKind(indexstore_symbol_subkind_t K) {
return SymbolSubKind::SwiftAssociatedType;
case INDEXSTORE_SYMBOL_SUBKIND_SWIFTGENERICTYPEPARAM:
return SymbolSubKind::SwiftGenericTypeParam;
case INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORBORROW:
return SymbolSubKind::SwiftAccessorBorrow;
case INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORMUTATE:
return SymbolSubKind::SwiftAccessorMutate;
}
}

Expand Down
2 changes: 2 additions & 0 deletions clang/lib/Index/IndexSymbol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,8 @@ StringRef index::getSymbolSubKindString(SymbolSubKind K) {
case SymbolSubKind::SwiftAccessorRead: return "acc-read";
case SymbolSubKind::SwiftAccessorModify: return "acc-modify";
case SymbolSubKind::SwiftAccessorInit: return "acc-init";
case SymbolSubKind::SwiftAccessorBorrow: return "acc-borrow";
case SymbolSubKind::SwiftAccessorMutate: return "acc-mutate";
case SymbolSubKind::SwiftExtensionOfStruct: return "ext-struct";
case SymbolSubKind::SwiftExtensionOfClass: return "ext-class";
case SymbolSubKind::SwiftExtensionOfEnum: return "ext-enum";
Expand Down