Index: lldb/lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit =================================================================== --- /dev/null +++ lldb/lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit @@ -0,0 +1,3 @@ +target variable GlobalVariable + +quit Index: lldb/lit/SymbolFile/NativePDB/ast-reconstruction.cpp =================================================================== --- lldb/lit/SymbolFile/NativePDB/ast-reconstruction.cpp +++ lldb/lit/SymbolFile/NativePDB/ast-reconstruction.cpp @@ -89,22 +89,23 @@ // CHECK: (TrivialC) TC = {} // CHECK: (TrivialS) TS = {} // CHECK: (TrivialU) TU = {} -// CHECK: (TrivialE) TE = -// CHECK: (A::B::C) ABCInt = (ABCMember = ) -// CHECK: (A::B::C) ABCFloat = (ABCMember = ) -// CHECK: (A::B::C) ABCVoid = (ABCSpecializationMember = ) +// CHECK: (TrivialE) TE = TE_A +// CHECK: (A::B::C) ABCInt = (ABCMember = 0) +// CHECK: (A::B::C) ABCFloat = (ABCMember = 0) +// CHECK: (A::B::C) ABCVoid = (ABCSpecializationMember = 0x0000000000000000) // CHECK: (A::C<0>) AC0 = {} // CHECK: (A::C<-1>) ACNeg1 = {} -// CHECK: (A::C<0>::D) AC0D = (ACDMember = , CPtr = ) -// CHECK: (A::C<-1>::D) ACNeg1D = (ACDMember = , CPtr = ) +// CHECK: (A::C<0>::D) AC0D = (ACDMember = 0, CPtr = 0x0000000000000000) +// CHECK: (A::C<-1>::D) ACNeg1D = (ACDMember = 0, CPtr = 0x0000000000000000) // CHECK: (A::D) AD = {} -// CHECK: (A::D::E) ADE = (ADDMember = ) +// CHECK: (A::D::E) ADE = (ADDMember = 0) // CHECK: Dumping clang ast for 1 modules. // CHECK: TranslationUnitDecl {{.*}} // CHECK: |-CXXRecordDecl {{.*}} class TrivialC definition // CHECK: |-CXXRecordDecl {{.*}} struct TrivialS definition // CHECK: |-CXXRecordDecl {{.*}} union TrivialU definition // CHECK: |-EnumDecl {{.*}} TrivialE +// CHECK: | `-EnumConstantDecl {{.*}} TE_A 'int' // CHECK: |-NamespaceDecl {{.*}} A // CHECK: | |-NamespaceDecl {{.*}} B // CHECK: | | |-CXXRecordDecl {{.*}} struct C definition Index: lldb/lit/SymbolFile/NativePDB/globals-bss.cpp =================================================================== --- /dev/null +++ lldb/lit/SymbolFile/NativePDB/globals-bss.cpp @@ -0,0 +1,35 @@ +// clang-format off +// REQUIRES: lld + +// Make sure we can read variables from BSS +// RUN: clang-cl /Z7 /GS- /GR- /c /Fo%t.obj -- %s +// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: llvm-readobj -s %t.exe | FileCheck --check-prefix=BSS %s +// RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb -f %t.exe -s \ +// RUN: %p/Inputs/globals-bss.lldbinit 2>&1 | FileCheck %s + +int GlobalVariable = 0; + +int main(int argc, char **argv) { + return 0; +} + +// BSS: Section { +// BSS-NEXT: Number: 3 +// BSS-NEXT: Name: .data +// BSS-NEXT: VirtualSize: 0x4 +// BSS-NEXT: VirtualAddress: +// BSS-NEXT: RawDataSize: 0 +// BSS-NEXT: PointerToRawData: 0x0 +// BSS-NEXT: PointerToRelocations: 0x0 +// BSS-NEXT: PointerToLineNumbers: 0x0 +// BSS-NEXT: RelocationCount: 0 +// BSS-NEXT: LineNumberCount: 0 +// BSS-NEXT: Characteristics [ (0xC0000040) +// BSS-NEXT: IMAGE_SCN_CNT_INITIALIZED_DATA (0x40) +// BSS-NEXT: IMAGE_SCN_MEM_READ (0x40000000) +// BSS-NEXT: IMAGE_SCN_MEM_WRITE (0x80000000) +// BSS-NEXT: ] +// BSS-NEXT: } + +// CHECK: (int) GlobalVariable = 0 Index: lldb/source/Core/ValueObjectVariable.cpp =================================================================== --- lldb/source/Core/ValueObjectVariable.cpp +++ lldb/source/Core/ValueObjectVariable.cpp @@ -67,7 +67,7 @@ CompilerType ValueObjectVariable::GetCompilerTypeImpl() { Type *var_type = m_variable_sp->GetType(); if (var_type) - return var_type->GetForwardCompilerType(); + return var_type->GetFullCompilerType(); return CompilerType(); } Index: lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h =================================================================== --- lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h +++ lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h @@ -125,6 +125,10 @@ ObjectFile::Strata CalculateStrata() override; + size_t ReadSectionData(lldb_private::Section *section, + lldb::offset_t section_offset, void *dst, + size_t dst_len) override; + //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ Index: lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp =================================================================== --- lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp +++ lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp @@ -1053,6 +1053,32 @@ } ObjectFile::Strata ObjectFilePECOFF::CalculateStrata() { return eStrataUser; } + +static bool IsCompressedBss(const Section §ion) { + if (section.GetName() != ConstString(".data")) + return false; + if (section.GetFileSize() != 0) + return false; + if (section.GetFileOffset() != 0) + return false; + return true; +} + +size_t ObjectFilePECOFF::ReadSectionData(Section *section, + lldb::offset_t section_offset, + void *dst, size_t dst_len) { + if (!IsCompressedBss(*section)) + return ObjectFile::ReadSectionData(section, section_offset, dst, dst_len); + + if (section_offset >= section->GetByteSize()) + return 0; + + size_t bytes_avail = section->GetByteSize() - section_offset; + size_t read_size = std::min(dst_len, bytes_avail); + ::memset(dst, 0, read_size); + return read_size; +} + //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------