Merge pull request #3708 from bnbarham/cherry-using-enum

[stable/20210726][IndexStore] Add a UsingEnum subkind to match the index

Author: akyrtzi

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,

clang/lib/Index/IndexDataStoreUtils.cpp

@@ -154,6 +154,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:
@@ -378,6 +380,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: