[PATCH] D109834: [lldb/win] Improve check-lldb-shell with LLVM_ENABLE_DIA_SDK=NO

[Nico Weber via Phabricator via llvm-commits]

thakis added a comment.

Oh, that's a good idea. But even if I force on the native PDB reader if LLVM_ENABLE_DIA_SDK is false [1], I still get 15 failures. That's better than 27, but it's more than 0. Maybe LLDB_USE_NATIVE_PDB_READER doesn't hit all uses of DIA in lldb?

  Failed Tests (15):
    lldb-shell :: Driver/TestSingleQuote.test
    lldb-shell :: Expr/nodefaultlib.cpp
    lldb-shell :: SymbolFile/NativePDB/stack_unwinding01.cpp
    lldb-shell :: SymbolFile/PDB/ast-restore.test
    lldb-shell :: SymbolFile/PDB/calling-conventions.test
    lldb-shell :: SymbolFile/PDB/class-layout.test
    lldb-shell :: SymbolFile/PDB/enums-layout.test
    lldb-shell :: SymbolFile/PDB/expressions.test
    lldb-shell :: SymbolFile/PDB/func-symbols.test
    lldb-shell :: SymbolFile/PDB/function-nested-block.test
    lldb-shell :: SymbolFile/PDB/pointers.test
    lldb-shell :: SymbolFile/PDB/type-quals.test
    lldb-shell :: SymbolFile/PDB/typedefs.test
    lldb-shell :: SymbolFile/PDB/udt-layout.test
    lldb-shell :: SymbolFile/PDB/variables.test
  
  
  Testing Time: 38.91s
    Unsupported      : 1113
    Passed           :  263
    Expectedly Failed:   14
    Failed           :   15

1:

  C:\src\llvm-project>git diff
  diff --git a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cppindex 794fab5f7309..51c74c59b137 100644
  --- a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
  +++ b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
  @@ -52,6 +52,10 @@
   #include "Plugins/Language/CPlusPlus/MSVCUndecoratedNameParser.h"
   #include "Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h"
  
  +#if defined(_WIN32)
  +#include "llvm/Config/config.h"
  +#endif
  +
   using namespace lldb;
   using namespace lldb_private;
   using namespace llvm::pdb;
  @@ -83,6 +87,7 @@ bool ShouldAddLine(uint32_t requested_line, uint32_t actual_line,
  
   static bool ShouldUseNativeReader() {
   #if defined(_WIN32)
  +#if LLVM_ENABLE_DIA_SDK
     llvm::StringRef use_native = ::getenv("LLDB_USE_NATIVE_PDB_READER");
     return use_native.equals_insensitive("on") ||
            use_native.equals_insensitive("yes") ||
  @@ -91,6 +96,9 @@ static bool ShouldUseNativeReader() {
   #else
     return true;
   #endif
  +#else
  +  return true;
  +#endif
   }
  
   void SymbolFilePDB::Initialize() {


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D109834/new/

https://reviews.llvm.org/D109834