diff options
19 files changed, 27 insertions, 47 deletions
diff --git a/lldb/include/lldb/DataFormatters/CXXFunctionPointer.h b/lldb/include/lldb/DataFormatters/CXXFunctionPointer.h index 54d13e01bfc..162e54a6efe 100644 --- a/lldb/include/lldb/DataFormatters/CXXFunctionPointer.h +++ b/lldb/include/lldb/DataFormatters/CXXFunctionPointer.h @@ -10,9 +10,7 @@ #ifndef liblldb_CXXFunctionPointer_h_ #define liblldb_CXXFunctionPointer_h_ -#include "lldb/Core/Stream.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/DataFormatters/TypeSummary.h" +#include "lldb-forward.h" namespace lldb_private { namespace formatters diff --git a/lldb/include/lldb/DataFormatters/FormatManager.h b/lldb/include/lldb/DataFormatters/FormatManager.h index 40616d1cf81..b32742bf75f 100644 --- a/lldb/include/lldb/DataFormatters/FormatManager.h +++ b/lldb/include/lldb/DataFormatters/FormatManager.h @@ -18,8 +18,6 @@ #include "lldb/lldb-public.h" #include "lldb/lldb-enumerations.h" -#include "lldb/Core/ThreadSafeDenseMap.h" - #include "lldb/DataFormatters/FormatCache.h" #include "lldb/DataFormatters/FormatClasses.h" #include "lldb/DataFormatters/FormattersContainer.h" diff --git a/lldb/include/lldb/DataFormatters/FormattersContainer.h b/lldb/include/lldb/DataFormatters/FormattersContainer.h index afb6662d976..0a97c7f21b1 100644 --- a/lldb/include/lldb/DataFormatters/FormattersContainer.h +++ b/lldb/include/lldb/DataFormatters/FormattersContainer.h @@ -19,24 +19,14 @@ // Project includes #include "lldb/lldb-public.h" -#include "lldb/Core/Log.h" #include "lldb/Core/RegularExpression.h" #include "lldb/Core/ValueObject.h" - #include "lldb/DataFormatters/FormatClasses.h" #include "lldb/DataFormatters/TypeFormat.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/DataFormatters/TypeValidator.h" - -#include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/CompilerType.h" - -#include "lldb/Target/ObjCLanguageRuntime.h" -#include "lldb/Target/Process.h" -#include "lldb/Target/StackFrame.h" -#include "lldb/Target/TargetList.h" - #include "lldb/Utility/StringLexer.h" namespace lldb_private { diff --git a/lldb/include/lldb/DataFormatters/TypeSummary.h b/lldb/include/lldb/DataFormatters/TypeSummary.h index ea172b66bb0..6b326025bbf 100644 --- a/lldb/include/lldb/DataFormatters/TypeSummary.h +++ b/lldb/include/lldb/DataFormatters/TypeSummary.h @@ -27,8 +27,6 @@ #include "lldb/Core/Error.h" #include "lldb/Core/FormatEntity.h" #include "lldb/Core/StructuredData.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Symbol/Type.h" namespace lldb_private { class TypeSummaryOptions diff --git a/lldb/include/lldb/DataFormatters/VectorIterator.h b/lldb/include/lldb/DataFormatters/VectorIterator.h index f41d4af3f63..07026b738c7 100644 --- a/lldb/include/lldb/DataFormatters/VectorIterator.h +++ b/lldb/include/lldb/DataFormatters/VectorIterator.h @@ -10,9 +10,10 @@ #ifndef liblldb_VectorIterator_h_ #define liblldb_VectorIterator_h_ -#include "lldb/Core/Stream.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/DataFormatters/TypeSummary.h" +#include "lldb-forward.h" + +#include "lldb/Core/ConstString.h" +#include "lldb/Target/ExecutionContext.h" namespace lldb_private { namespace formatters diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp index 042e9c69cab..fca43d6682e 100644 --- a/lldb/source/API/SBDebugger.cpp +++ b/lldb/source/API/SBDebugger.cpp @@ -43,6 +43,7 @@ #include "lldb/Target/Process.h" #include "lldb/Target/TargetList.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/DynamicLibrary.h" diff --git a/lldb/source/Core/FormatEntity.cpp b/lldb/source/Core/FormatEntity.cpp index 500518f6a23..a8685e39ab3 100644 --- a/lldb/source/Core/FormatEntity.cpp +++ b/lldb/source/Core/FormatEntity.cpp @@ -7,10 +7,11 @@ // //===----------------------------------------------------------------------===// -#include "llvm/ADT/StringRef.h" - #include "lldb/Core/FormatEntity.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/StringRef.h" + #include "lldb/Core/Address.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Module.h" diff --git a/lldb/source/DataFormatters/CXXFunctionPointer.cpp b/lldb/source/DataFormatters/CXXFunctionPointer.cpp index 6b8a5898114..c9e0ccb2969 100644 --- a/lldb/source/DataFormatters/CXXFunctionPointer.cpp +++ b/lldb/source/DataFormatters/CXXFunctionPointer.cpp @@ -9,6 +9,8 @@ #include "lldb/DataFormatters/CXXFunctionPointer.h" +#include "lldb/Core/Stream.h" +#include "lldb/Core/ValueObject.h" #include "lldb/Target/SectionLoadList.h" #include "lldb/Target/Target.h" diff --git a/lldb/source/DataFormatters/DataVisualization.cpp b/lldb/source/DataFormatters/DataVisualization.cpp index fdf86832ed6..071b89d68d3 100644 --- a/lldb/source/DataFormatters/DataVisualization.cpp +++ b/lldb/source/DataFormatters/DataVisualization.cpp @@ -14,8 +14,6 @@ // Other libraries and framework includes // Project includes -#include "lldb/Core/Debugger.h" - using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/DataFormatters/FormatManager.cpp b/lldb/source/DataFormatters/FormatManager.cpp index 12e8ef43bfd..12838931f2b 100644 --- a/lldb/source/DataFormatters/FormatManager.cpp +++ b/lldb/source/DataFormatters/FormatManager.cpp @@ -9,20 +9,19 @@ #include "lldb/DataFormatters/FormatManager.h" +#include "llvm/ADT/STLExtras.h" + // C Includes // C++ Includes // Other libraries and framework includes // Project includes #include "lldb/Core/Debugger.h" +#include "lldb/Core/Log.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/LanguageCategory.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Language.h" -#include "lldb/Target/Platform.h" -#include "llvm/ADT/STLExtras.h" - -#include <initializer_list> using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/DataFormatters/FormattersHelpers.cpp b/lldb/source/DataFormatters/FormattersHelpers.cpp index 290fda089f3..900fd32c810 100644 --- a/lldb/source/DataFormatters/FormattersHelpers.cpp +++ b/lldb/source/DataFormatters/FormattersHelpers.cpp @@ -19,6 +19,7 @@ #include "lldb/Core/ConstString.h" #include "lldb/Core/RegularExpression.h" #include "lldb/Target/StackFrame.h" +#include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" using namespace lldb; diff --git a/lldb/source/DataFormatters/StringPrinter.cpp b/lldb/source/DataFormatters/StringPrinter.cpp index 9bf2a03658d..041933ae7e9 100644 --- a/lldb/source/DataFormatters/StringPrinter.cpp +++ b/lldb/source/DataFormatters/StringPrinter.cpp @@ -9,7 +9,6 @@ #include "lldb/DataFormatters/StringPrinter.h" -#include "lldb/Core/DataExtractor.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Error.h" #include "lldb/Core/ValueObject.h" diff --git a/lldb/source/DataFormatters/TypeCategoryMap.cpp b/lldb/source/DataFormatters/TypeCategoryMap.cpp index 2798bf7e12c..7ad3343d940 100644 --- a/lldb/source/DataFormatters/TypeCategoryMap.cpp +++ b/lldb/source/DataFormatters/TypeCategoryMap.cpp @@ -9,8 +9,8 @@ #include "lldb/DataFormatters/TypeCategoryMap.h" +#include "lldb/Core/Log.h" #include "lldb/DataFormatters/FormatClasses.h" -#include "lldb/DataFormatters/FormatManager.h" // C Includes // C++ Includes diff --git a/lldb/source/DataFormatters/TypeFormat.cpp b/lldb/source/DataFormatters/TypeFormat.cpp index 15a39afdf4e..6ab8d298f94 100644 --- a/lldb/source/DataFormatters/TypeFormat.cpp +++ b/lldb/source/DataFormatters/TypeFormat.cpp @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +#include "lldb/DataFormatters/TypeFormat.h" + // C Includes // C++ Includes @@ -17,15 +19,11 @@ #include "lldb/lldb-public.h" #include "lldb/lldb-enumerations.h" -#include "lldb/Core/Debugger.h" #include "lldb/Core/StreamString.h" -#include "lldb/Core/Timer.h" #include "lldb/DataFormatters/FormatManager.h" -#include "lldb/DataFormatters/TypeFormat.h" -#include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Symbol/CompilerType.h" +#include "lldb/Symbol/SymbolContext.h" #include "lldb/Symbol/TypeList.h" -#include "lldb/Target/StackFrame.h" #include "lldb/Target/Target.h" using namespace lldb; diff --git a/lldb/source/DataFormatters/TypeSummary.cpp b/lldb/source/DataFormatters/TypeSummary.cpp index 648441da2cd..2806ba20c6a 100644 --- a/lldb/source/DataFormatters/TypeSummary.cpp +++ b/lldb/source/DataFormatters/TypeSummary.cpp @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +#include "lldb/DataFormatters/TypeSummary.h" + // C Includes // C++ Includes @@ -19,16 +21,13 @@ #include "lldb/Core/Debugger.h" #include "lldb/Core/StreamString.h" -#include "lldb/Core/Timer.h" -#include "lldb/DataFormatters/TypeSummary.h" +#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/ValueObjectPrinter.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Target/StackFrame.h" #include "lldb/Target/Target.h" -#include "lldb/Host/Host.h" - using namespace lldb; using namespace lldb_private; @@ -226,15 +225,9 @@ ScriptSummaryFormat::FormatObject (ValueObject *valobj, std::string& retval, const TypeSummaryOptions& options) { - Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__); - if (!valobj) return false; - Host::SetCrashDescriptionWithFormat("[Python summary] Name: %s - Function: %s", - valobj->GetName().AsCString("unknown"), - m_function_name.c_str()); - TargetSP target_sp(valobj->GetTargetSP()); if (!target_sp) diff --git a/lldb/source/DataFormatters/TypeSynthetic.cpp b/lldb/source/DataFormatters/TypeSynthetic.cpp index a6107586d7c..4098d59c8c7 100644 --- a/lldb/source/DataFormatters/TypeSynthetic.cpp +++ b/lldb/source/DataFormatters/TypeSynthetic.cpp @@ -23,7 +23,6 @@ #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Interpreter/ScriptInterpreter.h" #include "lldb/Symbol/CompilerType.h" -#include "lldb/Target/StackFrame.h" #include "lldb/Target/Target.h" using namespace lldb; diff --git a/lldb/source/DataFormatters/VectorType.cpp b/lldb/source/DataFormatters/VectorType.cpp index c04c0deca18..b14dfeca611 100644 --- a/lldb/source/DataFormatters/VectorType.cpp +++ b/lldb/source/DataFormatters/VectorType.cpp @@ -13,6 +13,7 @@ #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Symbol/TypeSystem.h" +#include "lldb/Target/Target.h" #include "lldb/Utility/LLDBAssert.h" diff --git a/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp b/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp index a07be9e4a7b..245f6da80c7 100644 --- a/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp @@ -17,9 +17,10 @@ #include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/TypeSynthetic.h" +#include "lldb/Symbol/ClangASTContext.h" #include "lldb/Target/ObjCLanguageRuntime.h" #include "lldb/Target/Process.h" -#include "lldb/Symbol/ClangASTContext.h" +#include "lldb/Target/Target.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp index 82143d288e8..8f072a12861 100644 --- a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp +++ b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp @@ -22,7 +22,9 @@ #include "lldb/DataFormatters/DataVisualization.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Symbol/CompilerType.h" +#include "lldb/Target/Target.h" #include "lldb/Target/ObjCLanguageRuntime.h" +#include "lldb/Symbol/ClangASTContext.h" #include "CF.h" #include "Cocoa.h" |
