Author: Nerixyz Date: 2026-09-10T16:13:21+02:00 New Revision: 26c633bf88337258f1b488bccfd74faa1efbafaa
URL: https://github.com/llvm/llvm-project/commit/26c633bf88337258f1b488bccfd74faa1efbafaa DIFF: https://github.com/llvm/llvm-project/commit/26c633bf88337258f1b488bccfd74faa1efbafaa.diff LOG: [lldb] Move most PDB shell tests to NativePDB (#222370) I plan to remove the DIA PDB plugin before the 24 release - we switched the default to the native one in 22. To avoid losing test coverage in the process, this moves the SymbolFile/PDB tests to SymbolFile/NativePDB. They were already running with both plugins. In some cases, we set `env LLDB_USE_NATIVE_PDB_READER=1`, which I flipped. The remaining shell tests are: - `func-symbols.test`: Has a duplicate in NativePDB with different checks, because the two plugins don't create identical types (see comment in test) - `udt-layout.test`: Also has a duplicate with different checks, because the two plugins show the base classes in a different order. Other than that, there's also a [unittest for PDB](https://github.com/llvm/llvm-project/blob/2de38b4861ed4a7be7ddd42fc803e91d1fe81b14/lldb/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp). I'm not sure what we should do about it. Looking over the tests there, most of these are already covered by the shell tests. Added: lldb/test/Shell/SymbolFile/NativePDB/Inputs/AstRestoreTest.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/CallingConventionsTest.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/ClassLayoutTest.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/CompilandsTest.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest0.script lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest1.script lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest2.script lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionLevelLinkingTest.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionLevelLinkingTest.h lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionLevelLinkingTest.ord lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionNestedBlockTest.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/PointerTypeTest.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/SimpleTypesTest.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/TypeQualsTest.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/VBases2.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/VBases2.script lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesLocationsTest.cpp lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesLocationsTest.script lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesTest.cpp lldb/test/Shell/SymbolFile/NativePDB/add-symbols.cpp lldb/test/Shell/SymbolFile/NativePDB/ast-restore.test lldb/test/Shell/SymbolFile/NativePDB/calling-conventions-arm.test lldb/test/Shell/SymbolFile/NativePDB/calling-conventions-x86.test lldb/test/Shell/SymbolFile/NativePDB/class-layout.test lldb/test/Shell/SymbolFile/NativePDB/compilands.test lldb/test/Shell/SymbolFile/NativePDB/enums-layout.test lldb/test/Shell/SymbolFile/NativePDB/expressions.test lldb/test/Shell/SymbolFile/NativePDB/function-level-linking.test lldb/test/Shell/SymbolFile/NativePDB/function-nested-block.test lldb/test/Shell/SymbolFile/NativePDB/native-setting-dia.cpp lldb/test/Shell/SymbolFile/NativePDB/native-setting-no-dia.cpp lldb/test/Shell/SymbolFile/NativePDB/pointers.test lldb/test/Shell/SymbolFile/NativePDB/type-quals.test lldb/test/Shell/SymbolFile/NativePDB/typedefs.test lldb/test/Shell/SymbolFile/NativePDB/variables-locations.test lldb/test/Shell/SymbolFile/NativePDB/variables.test lldb/test/Shell/SymbolFile/NativePDB/vbases2.test Modified: lldb/test/Shell/SymbolFile/NativePDB/func-symbols.test lldb/test/Shell/SymbolFile/PDB/func-symbols.test lldb/test/Shell/SymbolFile/PDB/udt-layout.test Removed: lldb/test/Shell/SymbolFile/NativePDB/native-setting.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/AstRestoreTest.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/CompilandsTest.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest0.script lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest1.script lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest2.script lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/PointerTypeTest.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/TypeQualsTest.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/VBases.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/VBases.script lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.script lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesTest.cpp lldb/test/Shell/SymbolFile/PDB/add-symbols.cpp lldb/test/Shell/SymbolFile/PDB/ast-restore.test lldb/test/Shell/SymbolFile/PDB/calling-conventions-arm.test lldb/test/Shell/SymbolFile/PDB/calling-conventions-x86.test lldb/test/Shell/SymbolFile/PDB/class-layout.test lldb/test/Shell/SymbolFile/PDB/compilands.test lldb/test/Shell/SymbolFile/PDB/enums-layout.test lldb/test/Shell/SymbolFile/PDB/expressions.test lldb/test/Shell/SymbolFile/PDB/function-level-linking.test lldb/test/Shell/SymbolFile/PDB/function-nested-block.test lldb/test/Shell/SymbolFile/PDB/native-setting.cpp lldb/test/Shell/SymbolFile/PDB/pointers.test lldb/test/Shell/SymbolFile/PDB/type-quals.test lldb/test/Shell/SymbolFile/PDB/typedefs.test lldb/test/Shell/SymbolFile/PDB/variables-locations.test lldb/test/Shell/SymbolFile/PDB/variables.test lldb/test/Shell/SymbolFile/PDB/vbases.test ################################################################################ diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/AstRestoreTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/AstRestoreTest.cpp similarity index 98% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/AstRestoreTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/AstRestoreTest.cpp index fb20c9d734bd2..4c215c0fc1f83 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/AstRestoreTest.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/AstRestoreTest.cpp @@ -1,3 +1,4 @@ +// clang-format off namespace N0 { namespace N1 { diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/CallingConventionsTest.cpp similarity index 95% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/CallingConventionsTest.cpp index 60854c04c60a7..66f09c30e3894 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/CallingConventionsTest.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/CallingConventionsTest.cpp @@ -1,3 +1,4 @@ +// clang-format off int FuncCCall() { return 0; } auto FuncCCallPtr = &FuncCCall; diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ClassLayoutTest.cpp similarity index 95% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/ClassLayoutTest.cpp index 34a0895ea787c..0c6830c959ecb 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/ClassLayoutTest.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ClassLayoutTest.cpp @@ -79,9 +79,7 @@ class Class : public Base { // Test base class. explicit Class(int a) { m_public = a; } // Test first reference of m_public. ~Class() {} - static int StaticMemberFunc(int a, ...) { - return 1; - } // Test static member function. + static int StaticMemberFunc(int a, ...) { return 1; } // Test static member function. int Get() { return 1; } int f(Friend c) { return c.f(); } inline bool operator==(const Class &rhs) const // Test operator. diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/CompilandsTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/CompilandsTest.cpp similarity index 57% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/CompilandsTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/CompilandsTest.cpp index 4cce7f667ff72..88431d977b707 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/CompilandsTest.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/CompilandsTest.cpp @@ -1,3 +1,4 @@ +// clang-format off int main() { return 0; } diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest.cpp similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest.cpp diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest0.script b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest0.script similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest0.script rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest0.script diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest1.script b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest1.script similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest1.script rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest1.script diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest2.script b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest2.script similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/ExpressionsTest2.script rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/ExpressionsTest2.script diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionLevelLinkingTest.cpp similarity index 84% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionLevelLinkingTest.cpp index fa0030bacbf3e..b9b3cff9d8277 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionLevelLinkingTest.cpp @@ -1,3 +1,4 @@ +// clang-format off #include "FunctionLevelLinkingTest.h" int foo() { diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionLevelLinkingTest.h similarity index 87% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionLevelLinkingTest.h index 0cc9d80d85d13..a54ac1ce8c9f4 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.h +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionLevelLinkingTest.h @@ -1,3 +1,4 @@ +// clang-format off #ifndef FUNCTION_LEVEL_LINKING_TEST_H #define FUNCTION_LEVEL_LINKING_TEST_H diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionLevelLinkingTest.ord similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionLevelLinkingTest.ord rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionLevelLinkingTest.ord diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionNestedBlockTest.cpp similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/FunctionNestedBlockTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/FunctionNestedBlockTest.cpp diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/PointerTypeTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/PointerTypeTest.cpp similarity index 90% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/PointerTypeTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/PointerTypeTest.cpp index 6612c30f00df8..55b7bc7b7ee43 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/PointerTypeTest.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/PointerTypeTest.cpp @@ -1,7 +1,7 @@ int main() { // Test pointer to array. int array[2][4]; - int(*array_pointer)[2][4] = &array; + int (*array_pointer)[2][4] = &array; struct ST { int a; diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/SimpleTypesTest.cpp similarity index 76% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/SimpleTypesTest.cpp index de13a5b430c15..a0064afde661a 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/SimpleTypesTest.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/SimpleTypesTest.cpp @@ -2,14 +2,14 @@ typedef unsigned long ULongArrayTypedef[10]; ULongArrayTypedef ULongArrayVar; -typedef long double*& RefTypedef; -long double* LongDoublePtrVar = 0; +typedef long double *&RefTypedef; +long double *LongDoublePtrVar = 0; RefTypedef RefVar = LongDoublePtrVar; -typedef long long (*FuncPtrTypedef)(int&, unsigned char**, short[], const double, volatile bool); +typedef long long (*FuncPtrTypedef)(int &, unsigned char **, short[], const double, volatile bool); FuncPtrTypedef FuncVar; -typedef char (*VarArgsFuncTypedef)(void*, long, unsigned short, unsigned int, ...); +typedef char (*VarArgsFuncTypedef)(void *, long, unsigned short, unsigned int, ...); VarArgsFuncTypedef VarArgsFuncVar; typedef float (*VarArgsFuncTypedefA)(...); @@ -47,6 +47,4 @@ WChar32Typedef WC32Var; typedef wchar_t WCharTypedef; WCharTypedef WCVar; -int main() { - return 0; -} +int main() { return 0; } diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/TypeQualsTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/TypeQualsTest.cpp similarity index 97% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/TypeQualsTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/TypeQualsTest.cpp index bedafcdacfc39..044a007a6680f 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/TypeQualsTest.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/TypeQualsTest.cpp @@ -1,3 +1,4 @@ +// clang-format off // Rank > 0 array typedef volatile int* RankNArray[10][100]; RankNArray ArrayVar; diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/VBases.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/VBases2.cpp similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/VBases.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/VBases2.cpp diff --git a/lldb/test/Shell/SymbolFile/NativePDB/Inputs/VBases2.script b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/VBases2.script new file mode 100644 index 0000000000000..cb708bc9e7a9f --- /dev/null +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/VBases2.script @@ -0,0 +1,7 @@ +breakpoint set --file VBases2.cpp --line 15 + +run + +expression c + +frame variable c diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesLocationsTest.cpp similarity index 94% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesLocationsTest.cpp index 7b7180a3ec43b..092ca3afc829b 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesLocationsTest.cpp @@ -1,3 +1,4 @@ +// clang-format off int g_var = 2222; void __fastcall foo(short arg_0, float arg_1) { diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.script b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesLocationsTest.script similarity index 68% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.script rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesLocationsTest.script index 7dd90352cce4f..e5ebcd9cd8525 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesLocationsTest.script +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesLocationsTest.script @@ -1,5 +1,5 @@ -breakpoint set --file VariablesLocationsTest.cpp --line 6 -breakpoint set --file VariablesLocationsTest.cpp --line 15 +breakpoint set --file VariablesLocationsTest.cpp --line 7 +breakpoint set --file VariablesLocationsTest.cpp --line 16 run diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesTest.cpp b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesTest.cpp similarity index 98% rename from lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesTest.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesTest.cpp index 304d905660917..43ff600fb4109 100644 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/VariablesTest.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/VariablesTest.cpp @@ -1,3 +1,4 @@ +// clang-format off typedef int IntTypedef; IntTypedef g_IntVar; // Testing globals. diff --git a/lldb/test/Shell/SymbolFile/PDB/add-symbols.cpp b/lldb/test/Shell/SymbolFile/NativePDB/add-symbols.cpp similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/add-symbols.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/add-symbols.cpp diff --git a/lldb/test/Shell/SymbolFile/PDB/ast-restore.test b/lldb/test/Shell/SymbolFile/NativePDB/ast-restore.test similarity index 86% rename from lldb/test/Shell/SymbolFile/PDB/ast-restore.test rename to lldb/test/Shell/SymbolFile/NativePDB/ast-restore.test index f8d19fd30362b..c7f090a6c7fcb 100644 --- a/lldb/test/Shell/SymbolFile/PDB/ast-restore.test +++ b/lldb/test/Shell/SymbolFile/NativePDB/ast-restore.test @@ -1,21 +1,21 @@ REQUIRES: system-windows, msvc RUN: %build --compiler=msvc --nodefaultlib --output=%t.exe %S/Inputs/AstRestoreTest.cpp RUN: lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=ENUM %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=ENUM %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=ENUM %s RUN: lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=GLOBAL %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=GLOBAL %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=GLOBAL %s RUN: lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=BASE %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=BASE %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=BASE %s RUN: lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=CLASS %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=CLASS %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=CLASS %s RUN: lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=INNER %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=INNER %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=INNER %s RUN: lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=TEMPLATE %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=TEMPLATE %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=TEMPLATE %s RUN: lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=FOO %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=FOO %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=FOO %s RUN: lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=MAIN %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=MAIN %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t.exe | FileCheck --check-prefix=MAIN %s ENUM: Module: {{.*}} ENUM: namespace N0 { diff --git a/lldb/test/Shell/SymbolFile/PDB/calling-conventions-arm.test b/lldb/test/Shell/SymbolFile/NativePDB/calling-conventions-arm.test similarity index 83% rename from lldb/test/Shell/SymbolFile/PDB/calling-conventions-arm.test rename to lldb/test/Shell/SymbolFile/NativePDB/calling-conventions-arm.test index 8b0b5b665274d..4d197ae3e6b8a 100644 --- a/lldb/test/Shell/SymbolFile/PDB/calling-conventions-arm.test +++ b/lldb/test/Shell/SymbolFile/NativePDB/calling-conventions-arm.test @@ -2,11 +2,11 @@ REQUIRES: target-windows, lld, (target-arm || target-aarch64) RUN: %build --compiler=clang-cl --arch=32 --nodefaultlib --output=%t.exe %S/Inputs/CallingConventionsTest.cpp RUN: lldb-test symbols -dump-ast %t.exe | FileCheck %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t.exe | FileCheck %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t.exe | FileCheck %s RUN: %build --compiler=clang-cl --arch=64 --nodefaultlib --output=%t.exe %S/Inputs/CallingConventionsTest.cpp RUN: lldb-test symbols -dump-ast %t.exe | FileCheck %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t.exe | FileCheck %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t.exe | FileCheck %s CHECK: Module: {{.*}} CHECK-DAG: int (*FuncCCallPtr)(); diff --git a/lldb/test/Shell/SymbolFile/PDB/calling-conventions-x86.test b/lldb/test/Shell/SymbolFile/NativePDB/calling-conventions-x86.test similarity index 90% rename from lldb/test/Shell/SymbolFile/PDB/calling-conventions-x86.test rename to lldb/test/Shell/SymbolFile/NativePDB/calling-conventions-x86.test index ceb7ad18919da..8da30470f1fd1 100644 --- a/lldb/test/Shell/SymbolFile/PDB/calling-conventions-x86.test +++ b/lldb/test/Shell/SymbolFile/NativePDB/calling-conventions-x86.test @@ -2,11 +2,11 @@ REQUIRES: system-windows, lld, (target-x86 || target-x86_64) RUN: %build --compiler=clang-cl --arch=32 --nodefaultlib --output=%t-32.exe %S/Inputs/CallingConventionsTest.cpp RUN: lldb-test symbols -dump-ast %t-32.exe | FileCheck --check-prefix 32BIT-CHECK %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t-32.exe | FileCheck --check-prefix 32BIT-CHECK %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t-32.exe | FileCheck --check-prefix 32BIT-CHECK %s RUN: %build --compiler=clang-cl --arch=64 --nodefaultlib --output=%t-64.exe %S/Inputs/CallingConventionsTest.cpp RUN: lldb-test symbols -dump-ast %t-64.exe | FileCheck --check-prefix 64BIT-CHECK %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -dump-ast %t-64.exe | FileCheck --check-prefix 64BIT-CHECK %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -dump-ast %t-64.exe | FileCheck --check-prefix 64BIT-CHECK %s 64BIT-CHECK: Module: {{.*}} 64BIT-CHECK-DAG: int (*FuncCCallPtr)(); diff --git a/lldb/test/Shell/SymbolFile/PDB/class-layout.test b/lldb/test/Shell/SymbolFile/NativePDB/class-layout.test similarity index 86% rename from lldb/test/Shell/SymbolFile/PDB/class-layout.test rename to lldb/test/Shell/SymbolFile/NativePDB/class-layout.test index eca910e997e40..167a35745c229 100644 --- a/lldb/test/Shell/SymbolFile/PDB/class-layout.test +++ b/lldb/test/Shell/SymbolFile/NativePDB/class-layout.test @@ -12,16 +12,16 @@ RUN: lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix RUN: lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=BASE %s RUN: lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=FRIEND %s RUN: lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=CLASS %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=ENUM %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=UNION %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=STRUCT %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=COMPLEX %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=LIST %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=UNNAMED-STRUCT %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=BASE %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=FRIEND %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=CLASS %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=ENUM %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=UNION %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=STRUCT %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=COMPLEX %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=LIST %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=UNNAMED-STRUCT %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=BASE %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=FRIEND %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=CLASS %s CHECK: Module [[MOD:.*]] CHECK: SymbolFile {{(native-)?}}pdb ([[MOD]]) diff --git a/lldb/test/Shell/SymbolFile/PDB/compilands.test b/lldb/test/Shell/SymbolFile/NativePDB/compilands.test similarity index 90% rename from lldb/test/Shell/SymbolFile/PDB/compilands.test rename to lldb/test/Shell/SymbolFile/NativePDB/compilands.test index ed28256c4a8b4..41467de1c4797 100644 --- a/lldb/test/Shell/SymbolFile/PDB/compilands.test +++ b/lldb/test/Shell/SymbolFile/NativePDB/compilands.test @@ -2,7 +2,7 @@ REQUIRES: target-windows, msvc RUN: mkdir -p %t.dir RUN: %build --compiler=clang-cl --mode=compile --arch=32 --nodefaultlib --output=%t.dir/CompilandsTest.cpp.obj %S/Inputs/CompilandsTest.cpp RUN: %build --compiler=msvc --mode=link --arch=32 --nodefaultlib --output=%t.dir/CompilandsTest.cpp.exe %t.dir/CompilandsTest.cpp.obj -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/CompilandsTest.cpp.exe | FileCheck %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/CompilandsTest.cpp.exe | FileCheck %s RUN: lldb-test symbols %t.dir/CompilandsTest.cpp.exe | FileCheck %s ; Link default libraries diff --git a/lldb/test/Shell/SymbolFile/PDB/enums-layout.test b/lldb/test/Shell/SymbolFile/NativePDB/enums-layout.test similarity index 87% rename from lldb/test/Shell/SymbolFile/PDB/enums-layout.test rename to lldb/test/Shell/SymbolFile/NativePDB/enums-layout.test index 9766d6f8b0324..8cba144a39f2c 100644 --- a/lldb/test/Shell/SymbolFile/PDB/enums-layout.test +++ b/lldb/test/Shell/SymbolFile/NativePDB/enums-layout.test @@ -7,12 +7,12 @@ RUN: lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check- RUN: lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=UCHAR-ENUM %s RUN: lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=CLASS-ENUM %s RUN: lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=STRUCT-ENUM %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=ENUM %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=CONST-ENUM %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=EMPTY-ENUM %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=UCHAR-ENUM %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=CLASS-ENUM %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=STRUCT-ENUM %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=ENUM %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=CONST-ENUM %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=EMPTY-ENUM %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=UCHAR-ENUM %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=CLASS-ENUM %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols %t.dir/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=STRUCT-ENUM %s ; FIXME: PDB does not have information about scoped enumeration (Enum class) so the ; compiler type used is the same as the one for unscoped enumeration. diff --git a/lldb/test/Shell/SymbolFile/PDB/expressions.test b/lldb/test/Shell/SymbolFile/NativePDB/expressions.test similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/expressions.test rename to lldb/test/Shell/SymbolFile/NativePDB/expressions.test diff --git a/lldb/test/Shell/SymbolFile/NativePDB/func-symbols.test b/lldb/test/Shell/SymbolFile/NativePDB/func-symbols.test index ee96fa8fd5c33..64e9cc4735901 100644 --- a/lldb/test/Shell/SymbolFile/NativePDB/func-symbols.test +++ b/lldb/test/Shell/SymbolFile/NativePDB/func-symbols.test @@ -1,9 +1,6 @@ # REQUIRES: lld, target-windows # Test that functions have the correct types. -# This uses the same input as SymbolFile/PDB/func-symbols.test. However, DIA -# creates one named `Type` per function and uses identical UIDs for `Type` and -# `Function`, whereas native creates one unnamed type per signature and has diff erent UIDs. # RUN: split-file %s %t # RUN: %build --compiler=clang-cl --arch=32 --nodefaultlib -o %t.exe %t/main.cpp %t/second.cpp diff --git a/lldb/test/Shell/SymbolFile/PDB/function-level-linking.test b/lldb/test/Shell/SymbolFile/NativePDB/function-level-linking.test similarity index 81% rename from lldb/test/Shell/SymbolFile/PDB/function-level-linking.test rename to lldb/test/Shell/SymbolFile/NativePDB/function-level-linking.test index 813b744230b9c..e19ede12eb090 100644 --- a/lldb/test/Shell/SymbolFile/PDB/function-level-linking.test +++ b/lldb/test/Shell/SymbolFile/NativePDB/function-level-linking.test @@ -1,5 +1,5 @@ REQUIRES: target-windows, lld RUN: %clang_cl_host /c /Zi /Gy %S/Inputs/FunctionLevelLinkingTest.cpp /o %t.obj RUN: lld-link /debug:full /nodefaultlib /entry:main /order:@%S/Inputs/FunctionLevelLinkingTest.ord %t.obj /out:%t.exe -RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -verify %t.exe +RUN: env LLDB_USE_NATIVE_PDB_READER=0 lldb-test symbols -verify %t.exe RUN: lldb-test symbols -verify %t.exe diff --git a/lldb/test/Shell/SymbolFile/PDB/function-nested-block.test b/lldb/test/Shell/SymbolFile/NativePDB/function-nested-block.test similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/function-nested-block.test rename to lldb/test/Shell/SymbolFile/NativePDB/function-nested-block.test diff --git a/lldb/test/Shell/SymbolFile/PDB/native-setting.cpp b/lldb/test/Shell/SymbolFile/NativePDB/native-setting-dia.cpp similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/native-setting.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/native-setting-dia.cpp diff --git a/lldb/test/Shell/SymbolFile/NativePDB/native-setting.cpp b/lldb/test/Shell/SymbolFile/NativePDB/native-setting-no-dia.cpp similarity index 100% rename from lldb/test/Shell/SymbolFile/NativePDB/native-setting.cpp rename to lldb/test/Shell/SymbolFile/NativePDB/native-setting-no-dia.cpp diff --git a/lldb/test/Shell/SymbolFile/PDB/pointers.test b/lldb/test/Shell/SymbolFile/NativePDB/pointers.test similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/pointers.test rename to lldb/test/Shell/SymbolFile/NativePDB/pointers.test diff --git a/lldb/test/Shell/SymbolFile/PDB/type-quals.test b/lldb/test/Shell/SymbolFile/NativePDB/type-quals.test similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/type-quals.test rename to lldb/test/Shell/SymbolFile/NativePDB/type-quals.test diff --git a/lldb/test/Shell/SymbolFile/PDB/typedefs.test b/lldb/test/Shell/SymbolFile/NativePDB/typedefs.test similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/typedefs.test rename to lldb/test/Shell/SymbolFile/NativePDB/typedefs.test diff --git a/lldb/test/Shell/SymbolFile/PDB/variables-locations.test b/lldb/test/Shell/SymbolFile/NativePDB/variables-locations.test similarity index 87% rename from lldb/test/Shell/SymbolFile/PDB/variables-locations.test rename to lldb/test/Shell/SymbolFile/NativePDB/variables-locations.test index 9f9a8497badd7..5977b58d232ec 100644 --- a/lldb/test/Shell/SymbolFile/PDB/variables-locations.test +++ b/lldb/test/Shell/SymbolFile/NativePDB/variables-locations.test @@ -1,7 +1,7 @@ REQUIRES: target-windows, lld RUN: %build --compiler=clang-cl --output=%t.exe %S/Inputs/VariablesLocationsTest.cpp RUN: %lldb -b -s %S/Inputs/VariablesLocationsTest.script -- %t.exe | FileCheck %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -b -s %S/Inputs/VariablesLocationsTest.script -- %t.exe | FileCheck %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 %lldb -b -s %S/Inputs/VariablesLocationsTest.script -- %t.exe | FileCheck %s CHECK: g_var = 2222 diff --git a/lldb/test/Shell/SymbolFile/PDB/variables.test b/lldb/test/Shell/SymbolFile/NativePDB/variables.test similarity index 100% rename from lldb/test/Shell/SymbolFile/PDB/variables.test rename to lldb/test/Shell/SymbolFile/NativePDB/variables.test diff --git a/lldb/test/Shell/SymbolFile/PDB/vbases.test b/lldb/test/Shell/SymbolFile/NativePDB/vbases2.test similarity index 59% rename from lldb/test/Shell/SymbolFile/PDB/vbases.test rename to lldb/test/Shell/SymbolFile/NativePDB/vbases2.test index e5ab80b0205a4..e6cb00f5ecb4f 100644 --- a/lldb/test/Shell/SymbolFile/PDB/vbases.test +++ b/lldb/test/Shell/SymbolFile/NativePDB/vbases2.test @@ -1,7 +1,7 @@ REQUIRES: target-windows, lld -RUN: %build --compiler=clang-cl --output=%t.exe %S/Inputs/VBases.cpp -RUN: %lldb -b -s %S/Inputs/VBases.script -- %t.exe | FileCheck %s -RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -b -s %S/Inputs/VBases.script -- %t.exe | FileCheck %s +RUN: %build --compiler=clang-cl --output=%t.exe %S/Inputs/VBases2.cpp +RUN: %lldb -b -s %S/Inputs/VBases2.script -- %t.exe | FileCheck %s +RUN: env LLDB_USE_NATIVE_PDB_READER=0 %lldb -b -s %S/Inputs/VBases2.script -- %t.exe | FileCheck %s CHECK: { CHECK: A = (a = '\x01') diff --git a/lldb/test/Shell/SymbolFile/PDB/Inputs/VBases.script b/lldb/test/Shell/SymbolFile/PDB/Inputs/VBases.script deleted file mode 100644 index 9206ccadafdb9..0000000000000 --- a/lldb/test/Shell/SymbolFile/PDB/Inputs/VBases.script +++ /dev/null @@ -1,7 +0,0 @@ -breakpoint set --file VBases.cpp --line 15 - -run - -expression c - -frame variable c diff --git a/lldb/test/Shell/SymbolFile/PDB/func-symbols.test b/lldb/test/Shell/SymbolFile/PDB/func-symbols.test index 6417bf39b0678..587baa05074e2 100644 --- a/lldb/test/Shell/SymbolFile/PDB/func-symbols.test +++ b/lldb/test/Shell/SymbolFile/PDB/func-symbols.test @@ -7,6 +7,10 @@ RUN: lldb-test symbols %t.dir/FuncSymbolsTest.exe | FileCheck --check-prefix=CHE ; Link multiple objects ; In this test, We don't check demangled name of a mangled function. +; This uses the same input as SymbolFile/NativePDB/func-symbols.test. However, DIA +; creates one named `Type` per function and uses identical UIDs for `Type` and +; `Function`, whereas native creates one unnamed type per signature and has diff erent UIDs. + CHECK-ONE: Module [[MD:.*]] CHECK-ONE-DAG: SymbolFile pdb ([[MD]]) CHECK-ONE-DAG: [[TY0:.*]]: Type{[[UID0:.*]]} , name = "Func_arg_array", decl = FuncSymbolsTestMain.cpp:3, compiler_type = {{.*}} int (int *) diff --git a/lldb/test/Shell/SymbolFile/PDB/udt-layout.test b/lldb/test/Shell/SymbolFile/PDB/udt-layout.test index 619646b3f12ba..3fa9487385b70 100644 --- a/lldb/test/Shell/SymbolFile/PDB/udt-layout.test +++ b/lldb/test/Shell/SymbolFile/PDB/udt-layout.test @@ -2,6 +2,9 @@ REQUIRES: target-windows, lld, diasdk RUN: %build --compiler=clang-cl --output=%t.exe %S/Inputs/UdtLayoutTest.cpp RUN: %lldb -b -s %S/Inputs/UdtLayoutTest.script -- %t.exe | FileCheck %s +; This uses the same input as SymbolFile/NativePDB/udt-layout.test. +; However, DIA has a diff erent order in which it prints the bases, so the checks are separated. + CHECK:(int) C::abc = 123 CHECK:(List[16]) ls = { CHECK: [15] = { _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
