13 files changed, 35 insertions, 3 deletions
diff --git a/lldb/include/lldb/API/SBBreakpointLocation.h b/lldb/include/lldb/API/SBBreakpointLocation.h
index e5a91c94301..f5ba34de3c0 100644
--- a/lldb/include/lldb/API/SBBreakpointLocation.h
+++ b/lldb/include/lldb/API/SBBreakpointLocation.h
@@ -75,7 +75,7 @@ public:
     IsResolved ();
 
     bool
-    GetDescription (const char *description_level, lldb::SBStream &description);
+    GetDescription (DescriptionLevel level, lldb::SBStream &description);
 
     SBBreakpoint
     GetBreakpoint ();
diff --git a/lldb/include/lldb/API/SBError.h b/lldb/include/lldb/API/SBError.h
index 7d695bbbc51..21f4e483d32 100644
--- a/lldb/include/lldb/API/SBError.h
+++ b/lldb/include/lldb/API/SBError.h
@@ -68,6 +68,9 @@ public:
     bool
     GetDescription (lldb::SBStream &description);
 
+    bool
+    GetDescription (lldb::SBStream &description) const;
+
 protected:
     friend class SBArguments;
     friend class SBDebugger;
diff --git a/lldb/include/lldb/API/SBEvent.h b/lldb/include/lldb/API/SBEvent.h
index cab413a9ab3..b36faef103d 100644
--- a/lldb/include/lldb/API/SBEvent.h
+++ b/lldb/include/lldb/API/SBEvent.h
@@ -57,6 +57,9 @@ public:
     bool
     GetDescription (lldb::SBStream &description);
 
+    bool
+    GetDescription (lldb::SBStream &description) const;
+
 protected:
     friend class SBListener;
     friend class SBBroadcaster;
diff --git a/lldb/include/lldb/API/SBFileSpec.h b/lldb/include/lldb/API/SBFileSpec.h
index 73538d31f37..e3c3da7000b 100644
--- a/lldb/include/lldb/API/SBFileSpec.h
+++ b/lldb/include/lldb/API/SBFileSpec.h
@@ -56,6 +56,9 @@ public:
     bool
     GetDescription (lldb::SBStream &description);
 
+    bool
+    GetDescription (lldb::SBStream &description) const;
+
 private:
     friend class SBBlock;
     friend class SBCompileUnit;
diff --git a/lldb/include/lldb/API/SBTarget.h b/lldb/include/lldb/API/SBTarget.h
index 60c535ec69f..6a2bb2bad76 100644
--- a/lldb/include/lldb/API/SBTarget.h
+++ b/lldb/include/lldb/API/SBTarget.h
@@ -162,7 +162,10 @@ public:
 #endif
 
     bool
-    GetDescription (lldb::SBStream &description);
+    GetDescription (lldb::SBStream &description, lldb::DescriptionLevel);
+
+    bool
+    GetDescription (lldb::SBStream &description, lldb::DescriptionLevel) const;
 
 protected:
     friend class SBAddress;
diff --git a/lldb/include/lldb/API/SBThread.h b/lldb/include/lldb/API/SBThread.h
index bf2cc4f2e97..46bdc64cdb0 100644
--- a/lldb/include/lldb/API/SBThread.h
+++ b/lldb/include/lldb/API/SBThread.h
@@ -91,6 +91,9 @@ public:
     bool
     GetDescription (lldb::SBStream &description);
 
+    bool
+    GetDescription (lldb::SBStream &description) const;
+
 protected:
     friend class SBBreakpoint;
     friend class SBBreakpointLocation;
diff --git a/lldb/include/lldb/Core/Communication.h b/lldb/include/lldb/Core/Communication.h
index dc8bfba4d92..d7e307fa045 100644
--- a/lldb/include/lldb/Core/Communication.h
+++ b/lldb/include/lldb/Core/Communication.h
@@ -331,6 +331,9 @@ public:
     SetReadThreadBytesReceivedCallback (ReadThreadBytesReceived callback,
                                         void *callback_baton);
 
+    static const char *
+    ConnectionStatusAsCString (lldb::ConnectionStatus status);
+
 private:
     //------------------------------------------------------------------
     // For Communication only
diff --git a/lldb/include/lldb/Core/InputReader.h b/lldb/include/lldb/Core/InputReader.h
index f9bd0483d8f..a37a9a68950 100644
--- a/lldb/include/lldb/Core/InputReader.h
+++ b/lldb/include/lldb/Core/InputReader.h
@@ -95,6 +95,9 @@ public:
     void
     WaitOnReaderIsDone ();
 
+    static const char *
+    GranularityAsCString (lldb::InputReaderGranularity granularity);
+
 protected:
     friend class Debugger;
 
diff --git a/lldb/include/lldb/Core/Module.h b/lldb/include/lldb/Core/Module.h
index fae70c8ca38..25c0f871fdf 100644
--- a/lldb/include/lldb/Core/Module.h
+++ b/lldb/include/lldb/Core/Module.h
@@ -98,6 +98,9 @@ public:
     virtual void
     CalculateSymbolContext (SymbolContext* sc);
 
+    void
+    GetDescription (Stream *s);
+
     //------------------------------------------------------------------
     /// Dump a description of this object to a Stream.
     ///
diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h
index 32fe250f893..1f73249680c 100644
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -183,7 +183,7 @@ public:
     ///     The stream to which to dump the object descripton.
     //------------------------------------------------------------------
     void
-    Dump (Stream *s);
+    Dump (Stream *s, lldb::DescriptionLevel description_level);
 
     const lldb::ProcessSP &
     CreateProcess (Listener &listener, const char *plugin_name = NULL);
diff --git a/lldb/include/lldb/Target/Thread.h b/lldb/include/lldb/Target/Thread.h
index 0f9dd02f6ca..00ef2075e7e 100644
--- a/lldb/include/lldb/Target/Thread.h
+++ b/lldb/include/lldb/Target/Thread.h
@@ -241,6 +241,12 @@ public:
     bool
     ThreadStoppedForAReason ();
 
+    static const char *
+    RunModeAsCString (lldb::RunMode mode);
+
+    static const char *
+    StopReasonAsCString (lldb::StopReason reason);
+
     virtual const char *
     GetInfo () = 0;
 
diff --git a/lldb/include/lldb/lldb-enumerations.h b/lldb/include/lldb/lldb-enumerations.h
index e29473e2277..632152f571e 100644
--- a/lldb/include/lldb/lldb-enumerations.h
+++ b/lldb/include/lldb/lldb-enumerations.h
@@ -533,6 +533,7 @@ typedef enum CommandArgumentType
     eArgTypeFunctionName,
     eArgTypeIndex,
     eArgTypeLineNum,
+    eArgTypeLogCategory,
     eArgTypeLogChannel,
     eArgTypeMethod,
     eArgTypeName,
diff --git a/lldb/include/lldb/lldb-private-log.h b/lldb/include/lldb/lldb-private-log.h
index ebdefd4ded9..d7bcc01515f 100644
--- a/lldb/include/lldb/lldb-private-log.h
+++ b/lldb/include/lldb/lldb-private-log.h
@@ -35,6 +35,7 @@
 #define LIBLLDB_LOG_CONNECTION          (1u << 13)
 #define LIBLLDB_LOG_HOST                (1u << 14)
 #define LIBLLDB_LOG_UNWIND              (1u << 15)
+#define LIBLLDB_LOG_API                 (1u << 16)
 #define LIBLLDB_LOG_ALL                 (UINT32_MAX)
 #define LIBLLDB_LOG_DEFAULT             (LIBLLDB_LOG_PROCESS     |\
                                          LIBLLDB_LOG_THREAD      |\