Kill the unused and unnecessary CXCursor_MemberRef, twin to the

now-dead CXCursor_ObjCIvarRef.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@93928 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang-c/Index.h b/include/clang-c/Index.h
index 9a4d2a2a123398d50b332cd8f540edd22c15b31d..62a6bf76741ac74809d291e5534680680844d06c 100644 (file)
--- a/include/clang-c/Index.h
+++ b/include/clang-c/Index.h
@@ -115,11 +115,10 @@ enum CXCursorKind {
  CXCursor_ObjCClassRef                  = 42,
  
  CXCursor_ObjCSelectorRef               = 43, /* Expression references */
- CXCursor_VarRef                        = 45,
- CXCursor_FunctionRef                   = 46,
- CXCursor_EnumConstantRef               = 47,
- CXCursor_MemberRef                     = 48,
- CXCursor_LastRef                       = 48,
+ CXCursor_VarRef                        = 44,
+ CXCursor_FunctionRef                   = 45,
+ CXCursor_EnumConstantRef               = 46,
+ CXCursor_LastRef                       = 46,
  
  /* Error conditions */
  CXCursor_FirstInvalid                  = 70,

diff --git a/tools/CIndex/CIndex.cpp b/tools/CIndex/CIndex.cpp
index 8906c950360114059567d2d6cfa2a0a915e8650f..10a57ae235d84a42bea8feef210063dbcedd7e5f 100644 (file)
--- a/tools/CIndex/CIndex.cpp
+++ b/tools/CIndex/CIndex.cpp
@@ -882,7 +882,6 @@ const char *clang_getCursorKindSpelling(enum CXCursorKind Kind) {
   case CXCursor_VarRef: return "VarRef";
   case CXCursor_FunctionRef: return "FunctionRef";
   case CXCursor_EnumConstantRef: return "EnumConstantRef";
-  case CXCursor_MemberRef: return "MemberRef";
 
   case CXCursor_InvalidFile: return "InvalidFile";
   case CXCursor_NoDeclFound: return "NoDeclFound";
@@ -1006,8 +1005,7 @@ CXSourceLocation clang_getCursorLocation(CXCursor C) {
     case CXCursor_ObjCSelectorRef:
     case CXCursor_VarRef:
     case CXCursor_FunctionRef:
-    case CXCursor_EnumConstantRef:
-    case CXCursor_MemberRef: {
+    case CXCursor_EnumConstantRef: {
       Expr *E = getCursorExpr(C);
       ASTContext &Context = getCursorContext(C);
       if (ObjCMessageExpr *Msg = dyn_cast<ObjCMessageExpr>(E))
@@ -1065,7 +1063,6 @@ CXSourceRange clang_getCursorExtent(CXCursor C) {
       case CXCursor_VarRef:
       case CXCursor_FunctionRef:
       case CXCursor_EnumConstantRef:
-      case CXCursor_MemberRef:
         return translateSourceRange(getCursorContext(C), 
                                     getCursorExpr(C)->getSourceRange());
         
@@ -1104,8 +1101,7 @@ CXCursor clang_getCursorReferenced(CXCursor C) {
     case CXCursor_ObjCSelectorRef:
     case CXCursor_VarRef:
     case CXCursor_FunctionRef:
-    case CXCursor_EnumConstantRef:
-    case CXCursor_MemberRef: {
+    case CXCursor_EnumConstantRef: {
       Decl *D = getDeclFromExpr(getCursorExpr(C));
       if (D)
         return MakeCXCursor(D);

diff --git a/tools/CIndex/CXCursor.cpp b/tools/CIndex/CXCursor.cpp
index fdeb885cf3d0eb9eb1e48ceb594c49f8acf1e420..d19dccab5b95de3355cce0b597dff67702ccb05d 100644 (file)
--- a/tools/CIndex/CXCursor.cpp
+++ b/tools/CIndex/CXCursor.cpp
@@ -175,7 +175,6 @@ ASTContext &cxcursor::getCursorContext(CXCursor Cursor) {
   case CXCursor_VarRef:
   case CXCursor_FunctionRef:
   case CXCursor_EnumConstantRef:
-  case CXCursor_MemberRef:
     return *static_cast<ASTContext *>(Cursor.data[2]);
   
   case CXCursor_InvalidFile: