Merge pull request #1960 from dcci/casually-running-into-you

apple-llvm-split-commit: b5df5fee76df892617aff98778c89391e66788b2
apple-llvm-split-dir: lldb/

Author: swift-ci

lldb/include/lldb/lldb-enumerations.h

@@ -657,8 +657,6 @@ enum SymbolType {
   eSymbolTypeObjCClass,
   eSymbolTypeObjCMetaClass,
   eSymbolTypeObjCIVar,
-  eSymbolTypeIVarOffset, // A symbol that contains an offset for an instance
-                         // variable
   eSymbolTypeReExported,
   eSymbolTypeASTFile   // A symbol whose name is the path to a compiler AST file
 };

lldb/scripts/Python/static-binding/LLDBWrapPython.cpp

@@ -82062,7 +82062,6 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "eSymbolTypeObjCClass",SWIG_From_int(static_cast< int >(lldb::eSymbolTypeObjCClass)));
   SWIG_Python_SetConstant(d, "eSymbolTypeObjCMetaClass",SWIG_From_int(static_cast< int >(lldb::eSymbolTypeObjCMetaClass)));
   SWIG_Python_SetConstant(d, "eSymbolTypeObjCIVar",SWIG_From_int(static_cast< int >(lldb::eSymbolTypeObjCIVar)));
-  SWIG_Python_SetConstant(d, "eSymbolTypeIVarOffset",SWIG_From_int(static_cast< int >(lldb::eSymbolTypeIVarOffset)));
   SWIG_Python_SetConstant(d, "eSymbolTypeReExported",SWIG_From_int(static_cast< int >(lldb::eSymbolTypeReExported)));
   SWIG_Python_SetConstant(d, "eSymbolTypeASTFile",SWIG_From_int(static_cast< int >(lldb::eSymbolTypeASTFile)));
   SWIG_Python_SetConstant(d, "eSectionTypeInvalid",SWIG_From_int(static_cast< int >(lldb::eSectionTypeInvalid)));

lldb/scripts/Python/static-binding/lldb.py

@@ -523,7 +523,6 @@ class _object : pass
 eSymbolTypeObjCClass = _lldb.eSymbolTypeObjCClass
 eSymbolTypeObjCMetaClass = _lldb.eSymbolTypeObjCMetaClass
 eSymbolTypeObjCIVar = _lldb.eSymbolTypeObjCIVar
-eSymbolTypeIVarOffset = _lldb.eSymbolTypeIVarOffset
 eSymbolTypeReExported = _lldb.eSymbolTypeReExported
 eSymbolTypeASTFile = _lldb.eSymbolTypeASTFile
 eSectionTypeInvalid = _lldb.eSectionTypeInvalid

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp

@@ -688,9 +688,6 @@ addr_t ClangExpressionDeclMap::GetSymbolAddress(Target &target,
     case eSymbolTypeASTFile:
       symbol_load_addr = sym_address.GetLoadAddress(&target);
       break;
-
-    case eSymbolTypeIVarOffset:
-      break;
     }
   }
 

lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp

@@ -1315,9 +1315,6 @@ AddressClass ObjectFileMachO::GetAddressClass(lldb::addr_t file_addr) {
         return AddressClass::eRuntime;
       case eSymbolTypeASTFile:
         return AddressClass::eDebug;
-
-      case eSymbolTypeIVarOffset:
-        break;
       }
     }
   }

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp

@@ -3875,9 +3875,6 @@ void GDBRemoteCommunicationClient::ServeSymbolLookups(
                         symbol_load_addr =
                             sc.symbol->GetLoadAddress(&process->GetTarget());
                         break;
-
-                      case eSymbolTypeIVarOffset:
-                        break;
                       }
                     }
                   }

lldb/source/Symbol/ObjectFile.cpp

@@ -456,9 +456,6 @@ AddressClass ObjectFile::GetAddressClass(addr_t file_addr) {
         return AddressClass::eRuntime;
       case eSymbolTypeASTFile:
         return AddressClass::eDebug;
-
-      case eSymbolTypeIVarOffset:
-        break;
       }
     }
   }

lldb/source/Symbol/Symbol.cpp

@@ -369,7 +369,6 @@ const char *Symbol::GetTypeAsString() const {
     ENUM_TO_CSTRING(ObjCClass);
     ENUM_TO_CSTRING(ObjCMetaClass);
     ENUM_TO_CSTRING(ObjCIVar);
-    ENUM_TO_CSTRING(IVarOffset);
     ENUM_TO_CSTRING(ReExported);
   default:
     break;

lldb/source/Symbol/SymbolContext.cpp

@@ -891,9 +891,6 @@ SymbolContext::FindBestGlobalDataSymbol(ConstString name, Status &error) {
 
             case eSymbolTypeASTFile:
               break;
-
-            case eSymbolTypeIVarOffset:
-              break;
           }
         }
       }