Author: labath
Date: Wed Aug 14 05:26:51 2019
New Revision: 368838
URL: http://llvm.org/viewvc/llvm-project?rev=368838&view=rev
Log:
Revert "Minidump/Windows: Fix module lookup"
Although there is nothing wrong with this patch, the test added here
uncovers a problem in other parts of the code which cause the test to
fail when running under asan. Reverting the patch until I can fix the
underlying issue(s).
This reverts commit r368416.
Removed:
lldb/trunk/lit/Minidump/Windows/Inputs/find-module.dmp.yaml
lldb/trunk/lit/Minidump/Windows/Inputs/find-module.exe.yaml
lldb/trunk/lit/Minidump/Windows/find-module.test
Modified:
lldb/trunk/source/Plugins/Process/minidump/MinidumpParser.cpp
Removed: lldb/trunk/lit/Minidump/Windows/Inputs/find-module.dmp.yaml
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Minidump/Windows/Inputs/find-module.dmp.yaml?rev=368837&view=auto
==============================================================================
--- lldb/trunk/lit/Minidump/Windows/Inputs/find-module.dmp.yaml (original)
+++ lldb/trunk/lit/Minidump/Windows/Inputs/find-module.dmp.yaml (removed)
@@ -1,26 +0,0 @@
---- !minidump
-Streams:
- - Type: ModuleList
- Modules:
- - Base of Image: 0x00000000000B0000
- Size of Image: 0x00005000
- Module Name: 'find-module.exe'
- CodeView Record:
525344533ED87D89C8A8184197F3A925EE4BF74101000000433A5C70726F6A656374735C746573745F6170705C436F6E736F6C654170706C69636174696F6E315C44656275675C436F6E736F6C654170706C69636174696F6E312E70646200
- - Type: SystemInfo
- Processor Arch: X86
- Processor Level: 23
- Processor Revision: 2050
- Number of Processors: 32
- Product type: 1
- Major Version: 10
- Build Number: 17134
- Platform ID: Win32NT
- Suite Mask: 0x0300
- CPU:
- Vendor ID: AuthenticAMD
- Version Info: 0x00800F82
- Feature Info: 0x178BFBFF
- AMD Extended Features: 0x2FD3FBFF
- - Type: MiscInfo
- Content:
54050000F703000008290000C883495D0000000000000000AC0D000098080000AC0D00000200000002000000002000000D0000000000000002000000C4FFFFFF430065006E007400720061006C0020004500750072006F007000650020005300740061006E0064006100720064002000540069006D006500000000000000000000000A0000000500030000000000000000000000430065006E007400720061006C0020004500750072006F00700065002000530075006D006D00650072002000540069006D00650000000000000000000000000000000300000005000200000000000000C4FFFFFF310037003100330034002E0031002E007800380036006600720065002E007200730034005F00720065006C0065006100730065002E003100380030003400310030002D00310038003000340000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064006200670063006F00720065002E0069003300380036002C00310030002E0030002E00310037003100330034002E0031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006C816B92
-...
Removed: lldb/trunk/lit/Minidump/Windows/Inputs/find-module.exe.yaml
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Minidump/Windows/Inputs/find-module.exe.yaml?rev=368837&view=auto
==============================================================================
--- lldb/trunk/lit/Minidump/Windows/Inputs/find-module.exe.yaml (original)
+++ lldb/trunk/lit/Minidump/Windows/Inputs/find-module.exe.yaml (removed)
@@ -1,32 +0,0 @@
---- !COFF
-OptionalHeader:
- AddressOfEntryPoint: 4224
- ImageBase: 4194304
- SectionAlignment: 4096
- FileAlignment: 512
- MajorOperatingSystemVersion: 6
- MinorOperatingSystemVersion: 0
- MajorImageVersion: 0
- MinorImageVersion: 0
- MajorSubsystemVersion: 6
- MinorSubsystemVersion: 0
- Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
- DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_NO_SEH,
IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ]
- SizeOfStackReserve: 1048576
- SizeOfStackCommit: 4096
- SizeOfHeapReserve: 1048576
- SizeOfHeapCommit: 4096
-header:
- Machine: IMAGE_FILE_MACHINE_I386
- Characteristics: [ IMAGE_FILE_EXECUTABLE_IMAGE, IMAGE_FILE_32BIT_MACHINE ]
-sections:
- - Name: .rdata
- Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
- VirtualAddress: 8192
- VirtualSize: 304
- - Name: .reloc
- Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA,
IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
- VirtualAddress: 16384
- VirtualSize: 48
-symbols: []
-...
Removed: lldb/trunk/lit/Minidump/Windows/find-module.test
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Minidump/Windows/find-module.test?rev=368837&view=auto
==============================================================================
--- lldb/trunk/lit/Minidump/Windows/find-module.test (original)
+++ lldb/trunk/lit/Minidump/Windows/find-module.test (removed)
@@ -1,10 +0,0 @@
-Test that we correctly find a PE/COFF file in our executable search path, and
-use it when opening minidumps.
-
-RUN: yaml2obj %S/Inputs/find-module.exe.yaml > %T/find-module.exe
-RUN: yaml2obj %S/Inputs/find-module.dmp.yaml > %T/find-module.dmp
-RUN: %lldb -O "settings set target.exec-search-paths %T" \
-RUN: -c %T/find-module.dmp -o "image dump objfile" -o exit | FileCheck %s
-
-CHECK-LABEL: image dump objfile
-CHECK: ObjectFilePECOFF, file = '{{.*}}find-module.exe', arch = i386
Modified: lldb/trunk/source/Plugins/Process/minidump/MinidumpParser.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/minidump/MinidumpParser.cpp?rev=368838&r1=368837&r2=368838&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/minidump/MinidumpParser.cpp (original)
+++ lldb/trunk/source/Plugins/Process/minidump/MinidumpParser.cpp Wed Aug 14
05:26:51 2019
@@ -188,7 +188,6 @@ ArchSpec MinidumpParser::GetArchitecture
case OSPlatform::Win32NT:
case OSPlatform::Win32CE:
triple.setOS(llvm::Triple::OSType::Win32);
- triple.setVendor(llvm::Triple::VendorType::PC);
break;
case OSPlatform::Linux:
triple.setOS(llvm::Triple::OSType::Linux);
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
