Fix build with python disabled after r249597

[loladiro]

Summary

r249597 introduced a usage of GetTypeSummary in lldb-mi. That function used to only be available when python is enabled. However, it doesn't seem like there's a reason for that anymore since that is now dealt with a different abstraction layer.

[brucem]

Getting rid of a lot of the #ifndef LLDB_DISABLE_PYTHON checks had been on my list of things I wanted to clean up. Since you regularly build with this configuration (and I never do), I suspect that a lot more of those checks could go away, but maybe that's best left for follow up patches?

[evgeny777]

Lgtm

[clayborg]

Wait for the OK from Enrico as well to verify this is OK.

[granata.enrico]

Looks fine to me

lldb/trunk/include/lldb/API/SBDefines.h

 class LLDB_API SBTypeEnumMember;
 class LLDB_API SBTypeEnumMemberList;
 class LLDB_API SBTypeFilter;
 class LLDB_API SBTypeFormat;
 class LLDB_API SBTypeMemberFunction;
 class LLDB_API SBTypeNameSpecifier;
 class LLDB_API SBTypeSummary;
 class LLDB_API SBTypeSummaryOptions;
-#ifndef LLDB_DISABLE_PYTHON
 class LLDB_API SBTypeSynthetic;
-#endif
 class LLDB_API SBTypeList;
 class LLDB_API SBValue;
 class LLDB_API SBValueList;
 class LLDB_API SBVariablesOptions;
 class LLDB_API SBWatchpoint;
 class LLDB_API SBUnixSignals;
 
 }
 
 #endif  // LLDB_SBDefines_h_

lldb/trunk/include/lldb/API/SBTypeSummary.h

 //===-- SBTypeSummary.h -------------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLDB_SBTypeSummary_h_
 #define LLDB_SBTypeSummary_h_
 
 #include "lldb/API/SBDefines.h"
 
-#ifndef LLDB_DISABLE_PYTHON
-
 namespace lldb {
     class LLDB_API SBTypeSummaryOptions
     {
     public:
         SBTypeSummaryOptions();
 
         SBTypeSummaryOptions (const lldb::SBTypeSummaryOptions &rhs);
         
protected:
         bool
         ChangeSummaryType (bool want_script);
         
     };
     
     
 } // namespace lldb
 
-#endif // LLDB_DISABLE_PYTHON
-
 #endif // LLDB_SBTypeSummary_h_

lldb/trunk/include/lldb/API/SBValue.h

public:
     SetValueFromCString (const char *value_str);
 
     bool
     SetValueFromCString (const char *value_str, lldb::SBError& error);
     
     lldb::SBTypeFormat
     GetTypeFormat ();
     
-#ifndef LLDB_DISABLE_PYTHON
     lldb::SBTypeSummary
     GetTypeSummary ();
-#endif
 
     lldb::SBTypeFilter
     GetTypeFilter ();
     
 #ifndef LLDB_DISABLE_PYTHON
     lldb::SBTypeSynthetic
     GetTypeSynthetic ();
 #endif

lldb/trunk/include/lldb/DataFormatters/TypeSummary.h

struct CXXFunctionSummaryFormat : public TypeSummaryImpl
         }
         
         typedef std::shared_ptr<CXXFunctionSummaryFormat> SharedPointer;
         
     private:
         DISALLOW_COPY_AND_ASSIGN(CXXFunctionSummaryFormat);
     };
     
-#ifndef LLDB_DISABLE_PYTHON
-    
     // Python-based summaries, running script code to show data
     struct ScriptSummaryFormat : public TypeSummaryImpl
     {
         std::string m_function_name;
         std::string m_python_script;
         StructuredData::ObjectSP m_script_function_sp;
 
         ScriptSummaryFormat(const TypeSummaryImpl::Flags& flags,
struct ScriptSummaryFormat : public TypeSummaryImpl
             return TypeSummaryImpl::eTypeScript;
         }
         
         typedef std::shared_ptr<ScriptSummaryFormat> SharedPointer;
         
     private:
         DISALLOW_COPY_AND_ASSIGN(ScriptSummaryFormat);
     };
-#endif
 } // namespace lldb_private
 
 #endif // lldb_TypeSummary_h_

lldb/trunk/include/lldb/lldb-forward.h

 class   RegisterContext;
 class   RegisterLocation;
 class   RegisterLocationList;
 class   RegisterValue;
 class   RegularExpression;
 class   Scalar;
 class   ScriptInterpreter;
 class   ScriptInterpreterLocker;
-#ifndef LLDB_DISABLE_PYTHON
 struct  ScriptSummaryFormat;
-#endif
 class   SearchFilter;
 class   Section;
 class   SectionImpl;
 class   SectionList;
 class   SectionLoadHistory;
 class   SectionLoadList;
 class   Settings;
 class   SourceManager;
namespace lldb {
     typedef std::weak_ptr<lldb_private::Process> ProcessWP;
     typedef std::shared_ptr<lldb_private::Property> PropertySP;
     typedef std::shared_ptr<lldb_private::RegisterCheckpoint> RegisterCheckpointSP;
     typedef std::shared_ptr<lldb_private::RegisterContext> RegisterContextSP;
     typedef std::shared_ptr<lldb_private::RegularExpression> RegularExpressionSP;
     typedef std::shared_ptr<lldb_private::Queue> QueueSP;
     typedef std::weak_ptr<lldb_private::Queue> QueueWP;
     typedef std::shared_ptr<lldb_private::QueueItem> QueueItemSP;
-#ifndef LLDB_DISABLE_PYTHON
     typedef std::shared_ptr<lldb_private::ScriptSummaryFormat> ScriptSummaryFormatSP;
-#endif // #ifndef LLDB_DISABLE_PYTHON
     typedef std::shared_ptr<lldb_private::ScriptInterpreter> ScriptInterpreterSP;
     typedef std::unique_ptr<lldb_private::ScriptInterpreter> ScriptInterpreterUP;
     typedef std::shared_ptr<lldb_private::Section> SectionSP;
     typedef std::unique_ptr<lldb_private::SectionList> SectionListUP;
     typedef std::weak_ptr<lldb_private::Section> SectionWP;
     typedef std::shared_ptr<lldb_private::SectionLoadList> SectionLoadListSP;
     typedef std::shared_ptr<lldb_private::SearchFilter> SearchFilterSP;
     typedef std::shared_ptr<lldb_private::Settings> SettingsSP;

lldb/trunk/source/API/SBTypeSummary.cpp

 #include "lldb/API/SBTypeSummary.h"
 #include "lldb/API/SBStream.h"
 #include "lldb/API/SBValue.h"
 #include "lldb/DataFormatters/DataVisualization.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
-#ifndef LLDB_DISABLE_PYTHON
-
 SBTypeSummaryOptions::SBTypeSummaryOptions()
 {
     m_opaque_ap.reset(new TypeSummaryOptions());
 }
 
 SBTypeSummaryOptions::SBTypeSummaryOptions (const lldb::SBTypeSummaryOptions &rhs)
 {
     if (rhs.m_opaque_ap)
if (!new_sp)
         else
             new_sp = TypeSummaryImplSP(new StringSummaryFormat(GetOptions(), ""));
     }
     
     SetSP(new_sp);
     
     return true;
 }
-
-#endif // LLDB_DISABLE_PYTHON

lldb/trunk/source/API/SBValue.cpp

SBValue::GetValueDidChange ()
     }
     if (log)
         log->Printf ("SBValue(%p)::GetValueDidChange() => %i",
                      static_cast<void*>(value_sp.get()), result);
 
     return result;
 }
 
-#ifndef LLDB_DISABLE_PYTHON
 const char *
 SBValue::GetSummary ()
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
     const char *cstr = NULL;
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
if (log)
             log->Printf ("SBValue(%p)::GetSummary() => \"%s\"",
                          static_cast<void*>(value_sp.get()), cstr);
         else
             log->Printf ("SBValue(%p)::GetSummary() => NULL",
                          static_cast<void*>(value_sp.get()));
     }
     return cstr;
 }
-#endif // LLDB_DISABLE_PYTHON
 
 const char *
 SBValue::GetLocation ()
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
     const char *cstr = NULL;
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
if (value_sp)
             lldb::TypeFormatImplSP format_sp = value_sp->GetValueFormat();
             if (format_sp)
                 format.SetSP(format_sp);
         }
     }
     return format;
 }
 
-#ifndef LLDB_DISABLE_PYTHON
 lldb::SBTypeSummary
 SBValue::GetTypeSummary ()
 {
     lldb::SBTypeSummary summary;
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
     {
         if (value_sp->UpdateValueIfNeeded(true))
         {
             lldb::TypeSummaryImplSP summary_sp = value_sp->GetSummaryFormat();
             if (summary_sp)
                 summary.SetSP(summary_sp);
         }
     }
     return summary;
 }
-#endif // LLDB_DISABLE_PYTHON
 
 lldb::SBTypeFilter
 SBValue::GetTypeFilter ()
 {
     lldb::SBTypeFilter filter;
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)

lldb/trunk/source/DataFormatters/TypeSummary.cpp

sstr.Printf ("%s%s%s%s%s%s%s %s",
                  IsOneLiner() ? " (one-line printout)" : "",
                  SkipsPointers() ? " (skip pointers)" : "",
                  SkipsReferences() ? " (skip references)" : "",
                  HideNames(nullptr) ? " (hide member names)" : "",
                  m_description.c_str());
     return sstr.GetString();
 }
 
-#ifndef LLDB_DISABLE_PYTHON
-
-
 ScriptSummaryFormat::ScriptSummaryFormat (const TypeSummaryImpl::Flags& flags,
                                           const char * function_name,
                                           const char * python_script) :
 TypeSummaryImpl(flags),
 m_function_name(),
 m_python_script(),
 m_script_function_sp()
 {
sstr.Printf ("%s%s%s%s%s%s%s\n%s",       Cascades() ? "" : " (not cascading)",
                  IsOneLiner() ? " (one-line printout)" : "",
                  SkipsPointers() ? " (skip pointers)" : "",
                  SkipsReferences() ? " (skip references)" : "",
                  HideNames(nullptr) ? " (hide member names)" : "",
                  m_python_script.c_str());
     return sstr.GetString();
     
 }
-
-#endif // #ifndef LLDB_DISABLE_PYTHON