Merge pull request #1968 from dcci/felicita

apple-llvm-split-commit: 807be824ea22fe76ffc2a0ecda6a7ec3f3669872
apple-llvm-split-dir: lldb/

Author: swift-ci

lldb/include/lldb/lldb-enumerations.h

@@ -1006,8 +1006,6 @@ enum PathType {
                          // mach-o file in LLDB.framework (MacOSX) exists
   ePathTypeSupportExecutableDir, // Find LLDB support executable directory
                                  // (debugserver, etc)
-  ePathTypeSupportFileDir,       // Find LLDB support file directory
-                                 // (non-executable files)
   ePathTypeHeaderDir,            // Find LLDB header file directory
   ePathTypePythonDir,            // Find Python modules (PYTHONPATH) directory
   ePathTypeLLDBSystemPlugins,    // System plug-ins directory

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

@@ -82270,7 +82270,6 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "eGdbSignalBreakpoint",SWIG_From_int(static_cast< int >(lldb::eGdbSignalBreakpoint)));
   SWIG_Python_SetConstant(d, "ePathTypeLLDBShlibDir",SWIG_From_int(static_cast< int >(lldb::ePathTypeLLDBShlibDir)));
   SWIG_Python_SetConstant(d, "ePathTypeSupportExecutableDir",SWIG_From_int(static_cast< int >(lldb::ePathTypeSupportExecutableDir)));
-  SWIG_Python_SetConstant(d, "ePathTypeSupportFileDir",SWIG_From_int(static_cast< int >(lldb::ePathTypeSupportFileDir)));
   SWIG_Python_SetConstant(d, "ePathTypeHeaderDir",SWIG_From_int(static_cast< int >(lldb::ePathTypeHeaderDir)));
   SWIG_Python_SetConstant(d, "ePathTypePythonDir",SWIG_From_int(static_cast< int >(lldb::ePathTypePythonDir)));
   SWIG_Python_SetConstant(d, "ePathTypeLLDBSystemPlugins",SWIG_From_int(static_cast< int >(lldb::ePathTypeLLDBSystemPlugins)));

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

@@ -731,7 +731,6 @@ class _object : pass
 eGdbSignalBreakpoint = _lldb.eGdbSignalBreakpoint
 ePathTypeLLDBShlibDir = _lldb.ePathTypeLLDBShlibDir
 ePathTypeSupportExecutableDir = _lldb.ePathTypeSupportExecutableDir
-ePathTypeSupportFileDir = _lldb.ePathTypeSupportFileDir
 ePathTypeHeaderDir = _lldb.ePathTypeHeaderDir
 ePathTypePythonDir = _lldb.ePathTypePythonDir
 ePathTypeLLDBSystemPlugins = _lldb.ePathTypeLLDBSystemPlugins

lldb/source/API/SBHostOS.cpp

@@ -80,7 +80,6 @@ SBFileSpec SBHostOS::GetLLDBPath(lldb::PathType path_type) {
     fspec = GetClangResourceDir();
     break;
 
-  case ePathTypeSupportFileDir:
   case ePathTypeSwiftDir:
     break;
   }