From 9cf99398dc718d8d0396017729524526e0c4136d Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Fri, 29 Oct 2021 09:47:57 +1000 Subject: [PATCH] [IndexStore] Add a `UsingEnum` subkind to match the index The index added `SymbolSubKind::UsingEnum`. Add this to the indexstore as well. Resolves rdar://84229820 --- clang/include/indexstore/indexstore.h | 1 + clang/lib/Index/IndexDataStoreUtils.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/clang/include/indexstore/indexstore.h b/clang/include/indexstore/indexstore.h index 6a21a54464146..36f7269d2c845 100644 --- a/clang/include/indexstore/indexstore.h +++ b/clang/include/indexstore/indexstore.h @@ -270,6 +270,7 @@ typedef enum { INDEXSTORE_SYMBOL_SUBKIND_ACCESSORSETTER = 4, INDEXSTORE_SYMBOL_SUBKIND_USINGTYPENAME = 5, INDEXSTORE_SYMBOL_SUBKIND_USINGVALUE = 6, + INDEXSTORE_SYMBOL_SUBKIND_USINGENUM = 7, INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORWILLSET = 1000, INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORDIDSET = 1001, diff --git a/clang/lib/Index/IndexDataStoreUtils.cpp b/clang/lib/Index/IndexDataStoreUtils.cpp index b479c885ad71b..56e00a9209ac7 100644 --- a/clang/lib/Index/IndexDataStoreUtils.cpp +++ b/clang/lib/Index/IndexDataStoreUtils.cpp @@ -153,6 +153,8 @@ SymbolSubKind index::getSymbolSubKind(indexstore_symbol_subkind_t K) { return SymbolSubKind::UsingTypename; case INDEXSTORE_SYMBOL_SUBKIND_USINGVALUE: return SymbolSubKind::UsingValue; + case INDEXSTORE_SYMBOL_SUBKIND_USINGENUM: + return SymbolSubKind::UsingEnum; case INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORWILLSET: return SymbolSubKind::SwiftAccessorWillSet; case INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORDIDSET: @@ -377,6 +379,8 @@ indexstore_symbol_subkind_t index::getIndexStoreSubKind(SymbolSubKind K) { return INDEXSTORE_SYMBOL_SUBKIND_USINGTYPENAME; case SymbolSubKind::UsingValue: return INDEXSTORE_SYMBOL_SUBKIND_USINGVALUE; + case SymbolSubKind::UsingEnum: + return INDEXSTORE_SYMBOL_SUBKIND_USINGENUM; case SymbolSubKind::SwiftAccessorWillSet: return INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORWILLSET; case SymbolSubKind::SwiftAccessorDidSet: