Author: davide
Date: Thu Nov 8 14:47:40 2018
New Revision: 346444
URL: http://llvm.org/viewvc/llvm-project?rev=346444&view=rev
Log:
Revert "Fix bug in PE/COFF plugin and ValueObjectVariable."
It breaks some tests on MacOS.
Removed:
lldb/trunk/lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit
lldb/trunk/lit/SymbolFile/NativePDB/globals-bss.cpp
Modified:
lldb/trunk/lit/SymbolFile/NativePDB/ast-reconstruction.cpp
lldb/trunk/source/Core/ValueObjectVariable.cpp
lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
Removed: lldb/trunk/lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit?rev=346443&view=auto
==============================================================================
--- lldb/trunk/lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit (original)
+++ lldb/trunk/lit/SymbolFile/NativePDB/Inputs/globals-bss.lldbinit (removed)
@@ -1,3 +0,0 @@
-target variable GlobalVariable
-
-quit
Modified: lldb/trunk/lit/SymbolFile/NativePDB/ast-reconstruction.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/NativePDB/ast-reconstruction.cpp?rev=346444&r1=346443&r2=346444&view=diff
==============================================================================
--- lldb/trunk/lit/SymbolFile/NativePDB/ast-reconstruction.cpp (original)
+++ lldb/trunk/lit/SymbolFile/NativePDB/ast-reconstruction.cpp Thu Nov 8
14:47:40 2018
@@ -89,23 +89,22 @@ Anonymous<A::B::C<int>>::D AnonABCVoidD;
// CHECK: (TrivialC) TC = {}
// CHECK: (TrivialS) TS = {}
// CHECK: (TrivialU) TU = {}
-// CHECK: (TrivialE) TE = TE_A
-// CHECK: (A::B::C<int>) ABCInt = (ABCMember = 0)
-// CHECK: (A::B::C<float>) ABCFloat = (ABCMember = 0)
-// CHECK: (A::B::C<void>) ABCVoid = (ABCSpecializationMember =
0x0000000000000000)
+// CHECK: (TrivialE) TE = <Unable to determine byte size.>
+// CHECK: (A::B::C<int>) ABCInt = (ABCMember = <read memory from {{.*}}
failed>)
+// CHECK: (A::B::C<float>) ABCFloat = (ABCMember = <read memory from {{.*}}
failed>)
+// CHECK: (A::B::C<void>) ABCVoid = (ABCSpecializationMember = <read memory
from {{.*}} failed>)
// CHECK: (A::C<0>) AC0 = {}
// CHECK: (A::C<-1>) ACNeg1 = {}
-// CHECK: (A::C<0>::D) AC0D = (ACDMember = 0, CPtr = 0x0000000000000000)
-// CHECK: (A::C<-1>::D) ACNeg1D = (ACDMember = 0, CPtr = 0x0000000000000000)
+// CHECK: (A::C<0>::D) AC0D = (ACDMember = <read memory from {{.*}} failed>,
CPtr = <read memory from {{.*}} failed>)
+// CHECK: (A::C<-1>::D) ACNeg1D = (ACDMember = <read memory from {{.*}}
failed>, CPtr = <read memory from {{.*}} failed>)
// CHECK: (A::D) AD = {}
-// CHECK: (A::D::E) ADE = (ADDMember = 0)
+// CHECK: (A::D::E) ADE = (ADDMember = <read memory from {{.*}} failed>)
// 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<int> definition
Removed: lldb/trunk/lit/SymbolFile/NativePDB/globals-bss.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/NativePDB/globals-bss.cpp?rev=346443&view=auto
==============================================================================
--- lldb/trunk/lit/SymbolFile/NativePDB/globals-bss.cpp (original)
+++ lldb/trunk/lit/SymbolFile/NativePDB/globals-bss.cpp (removed)
@@ -1,35 +0,0 @@
-// 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: Number: 3
-// BSS: 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
Modified: lldb/trunk/source/Core/ValueObjectVariable.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectVariable.cpp?rev=346444&r1=346443&r2=346444&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectVariable.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectVariable.cpp Thu Nov 8 14:47:40 2018
@@ -66,16 +66,9 @@ ValueObjectVariable::~ValueObjectVariabl
CompilerType ValueObjectVariable::GetCompilerTypeImpl() {
Type *var_type = m_variable_sp->GetType();
- if (!var_type)
- return CompilerType();
-
- // It's important to return the layout type here. If we have an enum then
the
- // symbol file plugin may have decided to complete it lazily, in which case a
- // forward type won't be sufficient to display the variable. On the other
- // hand, if we have a pointer to a class type, then getting the full type
will
- // resolve the class type, which is too much. The layout type is both
- // necessary and sufficient.
- return var_type->GetLayoutCompilerType();
+ if (var_type)
+ return var_type->GetForwardCompilerType();
+ return CompilerType();
}
ConstString ValueObjectVariable::GetTypeName() {
Modified: lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp?rev=346444&r1=346443&r2=346444&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp Thu Nov 8
14:47:40 2018
@@ -710,10 +710,7 @@ void ObjectFilePECOFF::CreateSections(Se
llvm::COFF::IMAGE_SCN_CNT_INITIALIZED_DATA &&
((const_sect_name == g_data_sect_name) ||
(const_sect_name == g_DATA_sect_name))) {
- if (m_sect_headers[idx].size == 0 && m_sect_headers[idx].offset == 0)
- section_type = eSectionTypeZeroFill;
- else
- section_type = eSectionTypeData;
+ section_type = eSectionTypeData;
} else if (m_sect_headers[idx].flags &
llvm::COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA &&
((const_sect_name == g_bss_sect_name) ||
@@ -1056,7 +1053,6 @@ ObjectFile::Type ObjectFilePECOFF::Calcu
}
ObjectFile::Strata ObjectFilePECOFF::CalculateStrata() { return eStrataUser; }
-
//------------------------------------------------------------------
// PluginInterface protocol
//------------------------------------------------------------------
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
