Author: enrico Date: Mon Oct 19 23:50:09 2015 New Revision: 250798 URL: http://llvm.org/viewvc/llvm-project?rev=250798&view=rev Log: Rationalization of includes in the data formatters code
Modified: lldb/trunk/include/lldb/DataFormatters/CXXFunctionPointer.h lldb/trunk/include/lldb/DataFormatters/FormatManager.h lldb/trunk/include/lldb/DataFormatters/FormattersContainer.h lldb/trunk/include/lldb/DataFormatters/TypeSummary.h lldb/trunk/include/lldb/DataFormatters/VectorIterator.h lldb/trunk/source/API/SBDebugger.cpp lldb/trunk/source/Core/FormatEntity.cpp lldb/trunk/source/DataFormatters/CXXFunctionPointer.cpp lldb/trunk/source/DataFormatters/DataVisualization.cpp lldb/trunk/source/DataFormatters/FormatManager.cpp lldb/trunk/source/DataFormatters/FormattersHelpers.cpp lldb/trunk/source/DataFormatters/StringPrinter.cpp lldb/trunk/source/DataFormatters/TypeCategoryMap.cpp lldb/trunk/source/DataFormatters/TypeFormat.cpp lldb/trunk/source/DataFormatters/TypeSummary.cpp lldb/trunk/source/DataFormatters/TypeSynthetic.cpp lldb/trunk/source/DataFormatters/VectorType.cpp lldb/trunk/source/Plugins/Language/ObjC/NSIndexPath.cpp lldb/trunk/source/Plugins/Language/ObjC/ObjCLanguage.cpp Modified: lldb/trunk/include/lldb/DataFormatters/CXXFunctionPointer.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/CXXFunctionPointer.h?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/include/lldb/DataFormatters/CXXFunctionPointer.h (original) +++ lldb/trunk/include/lldb/DataFormatters/CXXFunctionPointer.h Mon Oct 19 23:50:09 2015 @@ -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 Modified: lldb/trunk/include/lldb/DataFormatters/FormatManager.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/FormatManager.h?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/include/lldb/DataFormatters/FormatManager.h (original) +++ lldb/trunk/include/lldb/DataFormatters/FormatManager.h Mon Oct 19 23:50:09 2015 @@ -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" Modified: lldb/trunk/include/lldb/DataFormatters/FormattersContainer.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/FormattersContainer.h?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/include/lldb/DataFormatters/FormattersContainer.h (original) +++ lldb/trunk/include/lldb/DataFormatters/FormattersContainer.h Mon Oct 19 23:50:09 2015 @@ -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 { Modified: lldb/trunk/include/lldb/DataFormatters/TypeSummary.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/TypeSummary.h?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/include/lldb/DataFormatters/TypeSummary.h (original) +++ lldb/trunk/include/lldb/DataFormatters/TypeSummary.h Mon Oct 19 23:50:09 2015 @@ -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 Modified: lldb/trunk/include/lldb/DataFormatters/VectorIterator.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/VectorIterator.h?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/include/lldb/DataFormatters/VectorIterator.h (original) +++ lldb/trunk/include/lldb/DataFormatters/VectorIterator.h Mon Oct 19 23:50:09 2015 @@ -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 Modified: lldb/trunk/source/API/SBDebugger.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBDebugger.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/API/SBDebugger.cpp (original) +++ lldb/trunk/source/API/SBDebugger.cpp Mon Oct 19 23:50:09 2015 @@ -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" Modified: lldb/trunk/source/Core/FormatEntity.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/FormatEntity.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/Core/FormatEntity.cpp (original) +++ lldb/trunk/source/Core/FormatEntity.cpp Mon Oct 19 23:50:09 2015 @@ -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" Modified: lldb/trunk/source/DataFormatters/CXXFunctionPointer.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/CXXFunctionPointer.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/DataFormatters/CXXFunctionPointer.cpp (original) +++ lldb/trunk/source/DataFormatters/CXXFunctionPointer.cpp Mon Oct 19 23:50:09 2015 @@ -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" Modified: lldb/trunk/source/DataFormatters/DataVisualization.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/DataVisualization.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/DataFormatters/DataVisualization.cpp (original) +++ lldb/trunk/source/DataFormatters/DataVisualization.cpp Mon Oct 19 23:50:09 2015 @@ -14,8 +14,6 @@ // Other libraries and framework includes // Project includes -#include "lldb/Core/Debugger.h" - using namespace lldb; using namespace lldb_private; Modified: lldb/trunk/source/DataFormatters/FormatManager.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/FormatManager.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/DataFormatters/FormatManager.cpp (original) +++ lldb/trunk/source/DataFormatters/FormatManager.cpp Mon Oct 19 23:50:09 2015 @@ -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; Modified: lldb/trunk/source/DataFormatters/FormattersHelpers.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/FormattersHelpers.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/DataFormatters/FormattersHelpers.cpp (original) +++ lldb/trunk/source/DataFormatters/FormattersHelpers.cpp Mon Oct 19 23:50:09 2015 @@ -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; Modified: lldb/trunk/source/DataFormatters/StringPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/StringPrinter.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/DataFormatters/StringPrinter.cpp (original) +++ lldb/trunk/source/DataFormatters/StringPrinter.cpp Mon Oct 19 23:50:09 2015 @@ -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" Modified: lldb/trunk/source/DataFormatters/TypeCategoryMap.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/TypeCategoryMap.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/DataFormatters/TypeCategoryMap.cpp (original) +++ lldb/trunk/source/DataFormatters/TypeCategoryMap.cpp Mon Oct 19 23:50:09 2015 @@ -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 Modified: lldb/trunk/source/DataFormatters/TypeFormat.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/TypeFormat.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/DataFormatters/TypeFormat.cpp (original) +++ lldb/trunk/source/DataFormatters/TypeFormat.cpp Mon Oct 19 23:50:09 2015 @@ -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; Modified: lldb/trunk/source/DataFormatters/TypeSummary.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/TypeSummary.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/DataFormatters/TypeSummary.cpp (original) +++ lldb/trunk/source/DataFormatters/TypeSummary.cpp Mon Oct 19 23:50:09 2015 @@ -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 (Value 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) Modified: lldb/trunk/source/DataFormatters/TypeSynthetic.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/TypeSynthetic.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/DataFormatters/TypeSynthetic.cpp (original) +++ lldb/trunk/source/DataFormatters/TypeSynthetic.cpp Mon Oct 19 23:50:09 2015 @@ -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; Modified: lldb/trunk/source/DataFormatters/VectorType.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/VectorType.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/DataFormatters/VectorType.cpp (original) +++ lldb/trunk/source/DataFormatters/VectorType.cpp Mon Oct 19 23:50:09 2015 @@ -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" Modified: lldb/trunk/source/Plugins/Language/ObjC/NSIndexPath.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Language/ObjC/NSIndexPath.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Language/ObjC/NSIndexPath.cpp (original) +++ lldb/trunk/source/Plugins/Language/ObjC/NSIndexPath.cpp Mon Oct 19 23:50:09 2015 @@ -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; Modified: lldb/trunk/source/Plugins/Language/ObjC/ObjCLanguage.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Language/ObjC/ObjCLanguage.cpp?rev=250798&r1=250797&r2=250798&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Language/ObjC/ObjCLanguage.cpp (original) +++ lldb/trunk/source/Plugins/Language/ObjC/ObjCLanguage.cpp Mon Oct 19 23:50:09 2015 @@ -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" _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits