Author: labath Date: Mon Aug 5 04:29:01 2019 New Revision: 367835 URL: http://llvm.org/viewvc/llvm-project?rev=367835&view=rev Log: Fix PDB tests after r367820
The commit changed Module dumping code to call SymbolFile::Dump directly, which meant that we were no longer showing the plugin name in the output (as that was done in the SymbolVendor). This adds the plugin name printing code to the SymbolFile dump method, and tweak the assertions in the PDB tests to match it correctly. Modified: lldb/trunk/lit/SymbolFile/PDB/class-layout.test lldb/trunk/lit/SymbolFile/PDB/compilands.test lldb/trunk/lit/SymbolFile/PDB/func-symbols.test lldb/trunk/lit/SymbolFile/PDB/type-quals.test lldb/trunk/lit/SymbolFile/PDB/typedefs.test lldb/trunk/lit/SymbolFile/PDB/variables.test lldb/trunk/source/Symbol/SymbolFile.cpp Modified: lldb/trunk/lit/SymbolFile/PDB/class-layout.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/class-layout.test?rev=367835&r1=367834&r2=367835&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/class-layout.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/class-layout.test Mon Aug 5 04:29:01 2019 @@ -13,7 +13,7 @@ RUN: lldb-test symbols %T/ClassLayoutTes RUN: lldb-test symbols %T/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=CLASS %s CHECK: Module [[MOD:.*]] -CHECK: {{^[0-9A-F]+}}: SymbolVendor pdb ([[MOD]]) +CHECK: SymbolFile pdb ([[MOD]]) CHECK: {{^[0-9A-F]+}}: CompileUnit{{[{]0x[0-9a-f]+[}]}}, language = "c++", file = '{{.*}}\ClassLayoutTest.cpp' ENUM: name = "Enum", size = 4, decl = ClassLayoutTest.cpp:5 Modified: lldb/trunk/lit/SymbolFile/PDB/compilands.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/compilands.test?rev=367835&r1=367834&r2=367835&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/compilands.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/compilands.test Mon Aug 5 04:29:01 2019 @@ -7,5 +7,5 @@ RUN: env LLDB_USE_NATIVE_PDB_READER=0 ll ; Link default libraries CHECK: Module [[CU:.*]] -CHECK: {{^[0-9A-F]+}}: SymbolVendor pdb ([[CU]]) +CHECK: SymbolFile pdb ([[CU]]) CHECK: {{^[0-9A-F]+}}: CompileUnit{{[{]0x[0-9a-f]+[}]}}, language = "c++", file = '{{.*}}\CompilandsTest.cpp' Modified: lldb/trunk/lit/SymbolFile/PDB/func-symbols.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/func-symbols.test?rev=367835&r1=367834&r2=367835&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/func-symbols.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/func-symbols.test Mon Aug 5 04:29:01 2019 @@ -7,7 +7,7 @@ RUN: lldb-test symbols %T/FuncSymbolsTes ; In this test, We don't check demangled name of a mangled function. CHECK-ONE: Module [[MD:.*]] -CHECK-ONE-DAG: {{.*}}: SymbolVendor pdb ([[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 *) CHECK-ONE-DAG: [[TY1:.*]]: Type{[[UID1:.*]]} , name = "Func_arg_void", decl = FuncSymbolsTestMain.cpp:4, compiler_type = {{.*}} void (void) CHECK-ONE-DAG: [[TY2:.*]]: Type{[[UID2:.*]]} , name = "Func_arg_none", decl = FuncSymbolsTestMain.cpp:5, compiler_type = {{.*}} void (void) Modified: lldb/trunk/lit/SymbolFile/PDB/type-quals.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/type-quals.test?rev=367835&r1=367834&r2=367835&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/type-quals.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/type-quals.test Mon Aug 5 04:29:01 2019 @@ -4,7 +4,7 @@ RUN: %build --compiler=msvc --mode=link RUN: lldb-test symbols %T/TypeQualsTest.cpp.exe | FileCheck %s CHECK: Module [[MOD:.*]] -CHECK-DAG: {{^[0-9A-F]+}}: SymbolVendor pdb ([[MOD]]) +CHECK-DAG: SymbolFile pdb ([[MOD]]) CHECK-DAG: Type{{.*}} , name = "const int", size = 4, compiler_type = {{.*}} const int CHECK-DAG: Type{{.*}} , size = 4, compiler_type = {{.*}} const int * CHECK-DAG: Type{{.*}} , size = 4, compiler_type = {{.*}} const int **const Modified: lldb/trunk/lit/SymbolFile/PDB/typedefs.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/typedefs.test?rev=367835&r1=367834&r2=367835&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/typedefs.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/typedefs.test Mon Aug 5 04:29:01 2019 @@ -12,7 +12,7 @@ RUN: lldb-test symbols %T/SimpleTypesTes ; both of them is the same. CHECK: Module [[MOD:.*]] -CHECK: {{^[0-9A-F]+}}: SymbolVendor pdb ([[MOD]]) +CHECK: SymbolFile pdb ([[MOD]]) CHECK-DAG: name = "char32_t", size = 4, compiler_type = {{.*}} char32_t CHECK-DAG: name = "char16_t", size = 2, compiler_type = {{.*}} char16_t CHECK-DAG: Type{{.*}} , name = "unsigned long", size = 4, compiler_type = {{.*}} unsigned long Modified: lldb/trunk/lit/SymbolFile/PDB/variables.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/variables.test?rev=367835&r1=367834&r2=367835&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/variables.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/variables.test Mon Aug 5 04:29:01 2019 @@ -9,7 +9,7 @@ RUN: FileCheck --check-prefix=FUNC-CONST RUN: FileCheck --check-prefix=FUNC-MEMBER --input-file=%T/VariablesTest.out %s GLOBALS: Module [[MOD:.*]] -GLOBALS: SymbolVendor pdb ([[MOD]]) +GLOBALS: SymbolFile pdb ([[MOD]]) GLOBALS: CompileUnit{{.*}}, language = "c++", file = '{{.*}}\VariablesTest.cpp' GLOBALS-DAG: Variable{{.*}}, name = "g_IntVar" GLOBALS-SAME: scope = global, location = {{.*}}, external Modified: lldb/trunk/source/Symbol/SymbolFile.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/SymbolFile.cpp?rev=367835&r1=367834&r2=367835&view=diff ============================================================================== --- lldb/trunk/source/Symbol/SymbolFile.cpp (original) +++ lldb/trunk/source/Symbol/SymbolFile.cpp Mon Aug 5 04:29:01 2019 @@ -231,6 +231,8 @@ void SymbolFile::SectionFileAddressesCha } void SymbolFile::Dump(Stream &s) { + s.Format("SymbolFile {0} ({1})\n", GetPluginName(), + GetMainObjectFile()->GetFileSpec()); s.PutCString("Types:\n"); m_type_list.Dump(&s, /*show_context*/ false); s.PutChar('\n'); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits