From 1a05affa800d24a29436af155f3ec4e1d47cef09 Mon Sep 17 00:00:00 2001 From: James Y Knight Date: Wed, 23 May 2018 22:04:20 +0000 Subject: [PATCH] Remove spurious dependency on Process/elf-core from Process/Utility. These checks do absolutely nothing other than cause a library layering violation in the code. llvm-svn: 333134 --- lldb/source/Plugins/Process/Utility/CMakeLists.txt | 1 - .../Plugins/Process/Utility/RegisterContextPOSIX_arm.cpp | 7 +------ .../Process/Utility/RegisterContextPOSIX_arm64.cpp | 7 +------ .../Process/Utility/RegisterContextPOSIX_mips64.cpp | 9 ++------- .../Process/Utility/RegisterContextPOSIX_powerpc.cpp | 7 +------ .../Process/Utility/RegisterContextPOSIX_ppc64le.cpp | 6 +----- lldb/unittests/Symbol/CMakeLists.txt | 1 + 7 files changed, 7 insertions(+), 31 deletions(-) diff --git a/lldb/source/Plugins/Process/Utility/CMakeLists.txt b/lldb/source/Plugins/Process/Utility/CMakeLists.txt index 8997d1c300af..b43756acea63 100644 --- a/lldb/source/Plugins/Process/Utility/CMakeLists.txt +++ b/lldb/source/Plugins/Process/Utility/CMakeLists.txt @@ -58,7 +58,6 @@ add_lldb_library(lldbPluginProcessUtility PLUGIN lldbSymbol lldbTarget lldbUtility - lldbPluginProcessElfCore LINK_COMPONENTS Support ) diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm.cpp index c3fa83168951..352e251e3b64 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm.cpp @@ -13,6 +13,7 @@ #include "lldb/Core/RegisterValue.h" #include "lldb/Core/Scalar.h" +#include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/DataBufferHeap.h" @@ -20,7 +21,6 @@ #include "lldb/Utility/Endian.h" #include "llvm/Support/Compiler.h" -#include "Plugins/Process/elf-core/ProcessElfCore.h" #include "RegisterContextPOSIX_arm.h" using namespace lldb; @@ -107,11 +107,6 @@ RegisterContextPOSIX_arm::RegisterContextPOSIX_arm( } ::memset(&m_fpr, 0, sizeof m_fpr); - - // elf-core yet to support ReadFPR() - lldb::ProcessSP base = CalculateProcess(); - if (base.get()->GetPluginName() == ProcessElfCore::GetPluginNameStatic()) - return; } RegisterContextPOSIX_arm::~RegisterContextPOSIX_arm() {} diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.cpp index 192f06c3aa04..3ff93cde2347 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.cpp @@ -13,6 +13,7 @@ #include "lldb/Core/RegisterValue.h" #include "lldb/Core/Scalar.h" +#include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/DataBufferHeap.h" @@ -20,7 +21,6 @@ #include "lldb/Utility/Endian.h" #include "llvm/Support/Compiler.h" -#include "Plugins/Process/elf-core/ProcessElfCore.h" #include "RegisterContextPOSIX_arm64.h" using namespace lldb; @@ -126,11 +126,6 @@ RegisterContextPOSIX_arm64::RegisterContextPOSIX_arm64( } ::memset(&m_fpr, 0, sizeof m_fpr); - - // elf-core yet to support ReadFPR() - lldb::ProcessSP base = CalculateProcess(); - if (base.get()->GetPluginName() == ProcessElfCore::GetPluginNameStatic()) - return; } RegisterContextPOSIX_arm64::~RegisterContextPOSIX_arm64() {} diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp index 039ca0281237..98d1e6fa8817 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp @@ -13,6 +13,7 @@ #include "lldb/Core/RegisterValue.h" #include "lldb/Core/Scalar.h" +#include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/DataBufferHeap.h" @@ -20,11 +21,10 @@ #include "lldb/Utility/Endian.h" #include "llvm/Support/Compiler.h" -#include "Plugins/Process/elf-core/ProcessElfCore.h" #include "RegisterContextPOSIX_mips64.h" #include "RegisterContextFreeBSD_mips64.h" #include "RegisterContextLinux_mips64.h" -#include "RegisterContextLinux_mips.h" +#include "RegisterContextLinux_mips.h" using namespace lldb_private; using namespace lldb; @@ -59,11 +59,6 @@ RegisterContextPOSIX_mips64::RegisterContextPOSIX_mips64( static_cast(m_registers_count[gpr_registers_count] + m_registers_count[fpr_registers_count] + m_registers_count[msa_registers_count])); - - // elf-core yet to support ReadFPR() - ProcessSP base = CalculateProcess(); - if (base.get()->GetPluginName() == ProcessElfCore::GetPluginNameStatic()) - return; } RegisterContextPOSIX_mips64::~RegisterContextPOSIX_mips64() {} diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.cpp index ad52a4d309f5..9f0552539723 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.cpp @@ -14,6 +14,7 @@ #include "lldb/Core/RegisterValue.h" #include "lldb/Core/Scalar.h" +#include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/DataBufferHeap.h" @@ -21,7 +22,6 @@ #include "lldb/Utility/Endian.h" #include "llvm/Support/Compiler.h" -#include "Plugins/Process/elf-core/ProcessElfCore.h" #include "RegisterContextPOSIX_powerpc.h" using namespace lldb_private; @@ -95,11 +95,6 @@ RegisterContextPOSIX_powerpc::RegisterContextPOSIX_powerpc( RegisterInfoInterface *register_info) : RegisterContext(thread, concrete_frame_idx) { m_register_info_ap.reset(register_info); - - // elf-core yet to support ReadFPR() - ProcessSP base = CalculateProcess(); - if (base.get()->GetPluginName() == ProcessElfCore::GetPluginNameStatic()) - return; } RegisterContextPOSIX_powerpc::~RegisterContextPOSIX_powerpc() {} diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_ppc64le.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_ppc64le.cpp index 44578d7c5845..41ae5ec6b51a 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_ppc64le.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_ppc64le.cpp @@ -13,6 +13,7 @@ #include "lldb/Core/RegisterValue.h" #include "lldb/Core/Scalar.h" +#include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/DataBufferHeap.h" @@ -20,7 +21,6 @@ #include "lldb/Utility/Endian.h" #include "llvm/Support/Compiler.h" -#include "Plugins/Process/elf-core/ProcessElfCore.h" #include "RegisterContextPOSIX_ppc64le.h" using namespace lldb_private; @@ -117,10 +117,6 @@ RegisterContextPOSIX_ppc64le::RegisterContextPOSIX_ppc64le( RegisterInfoInterface *register_info) : RegisterContext(thread, concrete_frame_idx) { m_register_info_ap.reset(register_info); - - ProcessSP base = CalculateProcess(); - if (base.get()->GetPluginName() == ProcessElfCore::GetPluginNameStatic()) - return; } void RegisterContextPOSIX_ppc64le::InvalidateAllRegisters() {} diff --git a/lldb/unittests/Symbol/CMakeLists.txt b/lldb/unittests/Symbol/CMakeLists.txt index 2d042648c4b3..8a2033e6fa9e 100644 --- a/lldb/unittests/Symbol/CMakeLists.txt +++ b/lldb/unittests/Symbol/CMakeLists.txt @@ -7,6 +7,7 @@ add_lldb_unittest(SymbolTests lldbHost lldbSymbol lldbUtilityHelpers + lldbPluginObjectFileELF ) add_dependencies(SymbolTests yaml2obj)