From df96a70f74f4762ea10c1a5b301120777ccc2582 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 25 Aug 2016 21:13:16 +0000 Subject: [PATCH] Slightly reduce diffs against upstream lldb, and comment out PDB support. --- .../llvm/tools/lldb/include/lldb/Symbol/ClangASTContext.h | 8 ++++---- .../lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h | 2 +- .../FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp | 2 +- .../RegisterContextPOSIXProcessMonitor_powerpc.cpp | 2 +- .../Plugins/Process/gdb-remote/ProcessGDBRemote.cpp | 1 + contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp | 4 +++- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTContext.h b/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTContext.h index 08f7b6b412dc..fbcf86d38467 100644 --- a/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTContext.h +++ b/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTContext.h @@ -37,7 +37,7 @@ #include "lldb/lldb-enumerations.h" class DWARFASTParserClang; -class PDBASTParser; +//class PDBASTParser; namespace lldb_private { @@ -533,8 +533,8 @@ public: //------------------------------------------------------------------ DWARFASTParser * GetDWARFParser() override; - PDBASTParser * - GetPDBParser(); +// PDBASTParser * +// GetPDBParser(); //------------------------------------------------------------------ // ClangASTContext callbacks for external source lookups. @@ -1207,7 +1207,7 @@ protected: std::unique_ptr m_selector_table_ap; std::unique_ptr m_builtins_ap; std::unique_ptr m_dwarf_ast_parser_ap; - std::unique_ptr m_pdb_ast_parser_ap; +// std::unique_ptr m_pdb_ast_parser_ap; std::unique_ptr m_scratch_ast_source_ap; std::unique_ptr m_mangle_ctx_ap; CompleteTagDeclCallback m_callback_tag_decl; diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h index b691f68585e5..888e2a90ad76 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h +++ b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h @@ -20,7 +20,7 @@ // Other libraries and framework includes #include "lldb/Target/Process.h" #include "lldb/Target/ThreadList.h" -#include "Plugins/Process/POSIX/ProcessMessage.h" +#include "ProcessMessage.h" #include "ProcessFreeBSD.h" class ProcessMonitor; diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp index d557071aa993..9922311fd9db 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp +++ b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp @@ -11,7 +11,7 @@ #include "lldb/Core/RegisterValue.h" #include "lldb/Target/Thread.h" -#include "Plugins/Process/Utility/RegisterContextPOSIX_arm.h" +#include "RegisterContextPOSIX_arm.h" #include "ProcessFreeBSD.h" #include "RegisterContextPOSIXProcessMonitor_arm.h" #include "ProcessMonitor.h" diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.cpp index 170d83931afe..321e6ea262ce 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.cpp +++ b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.cpp @@ -11,7 +11,7 @@ #include "lldb/Core/RegisterValue.h" #include "lldb/Target/Thread.h" -#include "Plugins/Process/Utility/RegisterContextPOSIX_powerpc.h" +#include "RegisterContextPOSIX_powerpc.h" #include "ProcessFreeBSD.h" #include "RegisterContextPOSIXProcessMonitor_powerpc.h" #include "ProcessMonitor.h" diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index ad5c27e4e3e2..f53d4c63f67a 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -70,6 +70,7 @@ #include "Plugins/Process/Utility/GDBRemoteSignals.h" #include "Plugins/Process/Utility/InferiorCallPOSIX.h" #include "Plugins/Process/Utility/StopInfoMachException.h" +//#include "Plugins/Platform/MacOSX/PlatformRemoteiOS.h" #include "Utility/StringExtractorGDBRemote.h" #include "GDBRemoteRegisterContext.h" #include "ProcessGDBRemote.h" diff --git a/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp b/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp index 02882ef2ef4d..4bb7fd8be748 100644 --- a/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp +++ b/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp @@ -92,7 +92,7 @@ #include "lldb/Utility/LLDBAssert.h" #include "Plugins/SymbolFile/DWARF/DWARFASTParserClang.h" -#include "Plugins/SymbolFile/PDB/PDBASTParser.h" +//#include "Plugins/SymbolFile/PDB/PDBASTParser.h" #include @@ -9639,6 +9639,7 @@ ClangASTContext::GetDWARFParser() return m_dwarf_ast_parser_ap.get(); } +#if 0 PDBASTParser * ClangASTContext::GetPDBParser() { @@ -9646,6 +9647,7 @@ ClangASTContext::GetPDBParser() m_pdb_ast_parser_ap.reset(new PDBASTParser(*this)); return m_pdb_ast_parser_ap.get(); } +#endif bool ClangASTContext::LayoutRecordType(void *baton,