Re: [Lldb-commits] [lldb] r344279 - Revert SymbolFileNativePDB plugin.

[Davide Italiano via lldb-commits]

thanks.
On Thu, Oct 11, 2018 at 11:47 AM Zachary Turner via lldb-commits
<lldb-commits@lists.llvm.org> wrote:
>
> Author: zturner
> Date: Thu Oct 11 11:45:44 2018
> New Revision: 344279
>
> URL: http://llvm.org/viewvc/llvm-project?rev=344279&view=rev
> Log:
> Revert SymbolFileNativePDB plugin.
>
> This was originally causing some test failures on non-Windows
> platforms, which required fixes in the compiler and linker.  After
> those fixes, however, other tests started failing.  Reverting
> temporarily until I can address everything.
>
> Removed:
>     lldb/trunk/lit/SymbolFile/NativePDB/
>     lldb/trunk/source/Plugins/SymbolFile/NativePDB/
> Modified:
>     lldb/trunk/include/lldb/Utility/LLDBAssert.h
>     lldb/trunk/lit/lit.cfg
>     lldb/trunk/source/Plugins/SymbolFile/CMakeLists.txt
>     lldb/trunk/source/Plugins/SymbolFile/PDB/CMakeLists.txt
>     lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
>
> Modified: lldb/trunk/include/lldb/Utility/LLDBAssert.h
> URL: 
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/LLDBAssert.h?rev=344279&r1=344278&r2=344279&view=diff
> ==============================================================================
> --- lldb/trunk/include/lldb/Utility/LLDBAssert.h (original)
> +++ lldb/trunk/include/lldb/Utility/LLDBAssert.h Thu Oct 11 11:45:44 2018
> @@ -14,8 +14,7 @@
>  #define lldbassert(x) assert(x)
>  #else
>  #define lldbassert(x)                                                        
>   \
> -  lldb_private::lldb_assert(static_cast<bool>(x), #x, __FUNCTION__, 
> __FILE__,  \
> -                            __LINE__)
> +  lldb_private::lldb_assert(x, #x, __FUNCTION__, __FILE__, __LINE__)
>  #endif
>
>  namespace lldb_private {
>
> Modified: lldb/trunk/lit/lit.cfg
> URL: 
> http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/lit.cfg?rev=344279&r1=344278&r2=344279&view=diff
> ==============================================================================
> --- lldb/trunk/lit/lit.cfg (original)
> +++ lldb/trunk/lit/lit.cfg Thu Oct 11 11:45:44 2018
> @@ -64,8 +64,6 @@ lldb = "%s -S %s/lit-lldb-init" % (lit.u
>                                 config.test_source_root)
>
>  lldbmi = lit.util.which('lldb-mi', lldb_tools_dir)
> -if lldbmi:
> -    config.available_features.add('lldb-mi')
>
>  if not os.path.exists(config.cc):
>      config.cc = lit.util.which(config.cc, config.environment['PATH'])
> @@ -92,8 +90,7 @@ if platform.system() in ['OpenBSD']:
>  config.substitutions.append(('%cc', config.cc))
>  config.substitutions.append(('%cxx', config.cxx))
>
> -if lldbmi:
> -  config.substitutions.append(('%lldbmi', lldbmi + " --synchronous"))
> +config.substitutions.append(('%lldbmi', lldbmi + " --synchronous"))
>  config.substitutions.append(('%lldb', lldb))
>
>  if debugserver is not None:
>
> Modified: lldb/trunk/source/Plugins/SymbolFile/CMakeLists.txt
> URL: 
> http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/CMakeLists.txt?rev=344279&r1=344278&r2=344279&view=diff
> ==============================================================================
> --- lldb/trunk/source/Plugins/SymbolFile/CMakeLists.txt (original)
> +++ lldb/trunk/source/Plugins/SymbolFile/CMakeLists.txt Thu Oct 11 11:45:44 
> 2018
> @@ -1,4 +1,3 @@
>  add_subdirectory(DWARF)
>  add_subdirectory(Symtab)
> -add_subdirectory(NativePDB)
>  add_subdirectory(PDB)
>
> Modified: lldb/trunk/source/Plugins/SymbolFile/PDB/CMakeLists.txt
> URL: 
> http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/PDB/CMakeLists.txt?rev=344279&r1=344278&r2=344279&view=diff
> ==============================================================================
> --- lldb/trunk/source/Plugins/SymbolFile/PDB/CMakeLists.txt (original)
> +++ lldb/trunk/source/Plugins/SymbolFile/PDB/CMakeLists.txt Thu Oct 11 
> 11:45:44 2018
> @@ -9,7 +9,6 @@ add_lldb_library(lldbPluginSymbolFilePDB
>      lldbCore
>      lldbSymbol
>         lldbUtility
> -  lldbPluginSymbolFileNativePDB
>    LINK_COMPONENTS
>      DebugInfoPDB
>      Support
>
> Modified: lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
> URL: 
> http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp?rev=344279&r1=344278&r2=344279&view=diff
> ==============================================================================
> --- lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp (original)
> +++ lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp Thu Oct 11 
> 11:45:44 2018
> @@ -46,7 +46,6 @@
>  #include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h"
>
>  #include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h" // For 
> IsCPPMangledName
> -#include "Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h"
>  #include "Plugins/SymbolFile/PDB/PDBASTParser.h"
>  #include "Plugins/SymbolFile/PDB/PDBLocationToDWARFExpression.h"
>
> @@ -75,31 +74,14 @@ bool ShouldAddLine(uint32_t requested_li
>  }
>  } // namespace
>
> -static bool ShouldUseNativeReader() {
> -#if !defined(_WIN32)
> -  return true;
> -#endif
> -  llvm::StringRef use_native = ::getenv("LLDB_USE_NATIVE_PDB_READER");
> -  return use_native.equals_lower("on") || use_native.equals_lower("yes") ||
> -         use_native.equals_lower("1") || use_native.equals_lower("true");
> -}
> -
>  void SymbolFilePDB::Initialize() {
> -  if (ShouldUseNativeReader()) {
> -    npdb::SymbolFileNativePDB::Initialize();
> -  } else {
> -    PluginManager::RegisterPlugin(GetPluginNameStatic(),
> -                                  GetPluginDescriptionStatic(), 
> CreateInstance,
> -                                  DebuggerInitialize);
> -  }
> +  PluginManager::RegisterPlugin(GetPluginNameStatic(),
> +                                GetPluginDescriptionStatic(), CreateInstance,
> +                                DebuggerInitialize);
>  }
>
>  void SymbolFilePDB::Terminate() {
> -  if (ShouldUseNativeReader()) {
> -    npdb::SymbolFileNativePDB::Terminate();
> -  } else {
> -    PluginManager::UnregisterPlugin(CreateInstance);
> -  }
> +  PluginManager::UnregisterPlugin(CreateInstance);
>  }
>
>  void SymbolFilePDB::DebuggerInitialize(lldb_private::Debugger &debugger) {}
>
>
> _______________________________________________
> lldb-commits mailing list
> lldb-commits@lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits