Merge pull request #362 from jkorous-apple/apple/stable/20190619

Apple/stable/20190619
apple · Oct 7, 2019 · b73ce4d · b73ce4d
2 parents ea94718 + dafa911
commit b73ce4d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/include/indexstore/indexstore.h b/include/indexstore/indexstore.h
@@ -297,6 +297,7 @@ typedef enum {
   INDEXSTORE_SYMBOL_ROLE_ADDRESSOF    = 1 << 7,
   INDEXSTORE_SYMBOL_ROLE_IMPLICIT     = 1 << 8,
   INDEXSTORE_SYMBOL_ROLE_UNDEFINITION = 1 << 19,
+  INDEXSTORE_SYMBOL_ROLE_NAMEREFERENCE = 1 << 20,
 
   // Relation roles.
   INDEXSTORE_SYMBOL_ROLE_REL_CHILDOF     = 1 << 9,

diff --git a/lib/Index/IndexDataStoreUtils.cpp b/lib/Index/IndexDataStoreUtils.cpp
@@ -275,6 +275,8 @@ SymbolRoleSet index::getSymbolRoles(uint64_t Roles) {
     SymbolRoles |= (SymbolRoleSet)SymbolRole::RelationIBTypeOf;
   if (Roles & INDEXSTORE_SYMBOL_ROLE_REL_SPECIALIZATIONOF)
     SymbolRoles |= (SymbolRoleSet)SymbolRole::RelationSpecializationOf;
+  if (Roles & INDEXSTORE_SYMBOL_ROLE_NAMEREFERENCE)
+    SymbolRoles |= (SymbolRoleSet)SymbolRole::NameReference;
 
   return SymbolRoles;
 }
@@ -511,6 +513,9 @@ uint64_t index::getIndexStoreRoles(SymbolRoleSet Roles) {
     case SymbolRole::RelationSpecializationOf:
       storeRoles |= INDEXSTORE_SYMBOL_ROLE_REL_SPECIALIZATIONOF;
       break;
+    case SymbolRole::NameReference:
+      storeRoles |= INDEXSTORE_SYMBOL_ROLE_NAMEREFERENCE;
+      break;
     }
   });
   return storeRoles;