4 files changed, 36 insertions, 0 deletions
diff --git a/lldb/include/lldb/API/SBBreakpoint.h b/lldb/include/lldb/API/SBBreakpoint.h
index a7ac291f67b..4b4bb8a52f3 100644
--- a/lldb/include/lldb/API/SBBreakpoint.h
+++ b/lldb/include/lldb/API/SBBreakpoint.h
@@ -70,6 +70,12 @@ public:
 
     uint32_t
     GetIgnoreCount () const;
+    
+    void 
+    SetCondition (const char *condition);
+    
+    const char *
+    GetCondition ();
 
     void
     SetThreadID (lldb::tid_t sb_thread_id);
diff --git a/lldb/include/lldb/API/SBBreakpointLocation.h b/lldb/include/lldb/API/SBBreakpointLocation.h
index 162928e14d2..e5a91c94301 100644
--- a/lldb/include/lldb/API/SBBreakpointLocation.h
+++ b/lldb/include/lldb/API/SBBreakpointLocation.h
@@ -41,6 +41,12 @@ public:
     void
     SetIgnoreCount (uint32_t n);
 
+    void 
+    SetCondition (const char *condition);
+    
+    const char *
+    GetCondition ();
+
     void
     SetThreadID (lldb::tid_t sb_thread_id);
 
diff --git a/lldb/source/API/SBBreakpoint.cpp b/lldb/source/API/SBBreakpoint.cpp
index 8f0545310b1..2ba7b9e96b9 100644
--- a/lldb/source/API/SBBreakpoint.cpp
+++ b/lldb/source/API/SBBreakpoint.cpp
@@ -205,6 +205,18 @@ SBBreakpoint::SetIgnoreCount (uint32_t count)
         m_opaque_sp->SetIgnoreCount (count);
 }
 
+void
+SBBreakpoint::SetCondition (const char *condition)
+{
+    m_opaque_sp->SetCondition (condition);
+}
+
+const char *
+SBBreakpoint::GetCondition ()
+{
+    return m_opaque_sp->GetConditionText ();
+}
+
 uint32_t
 SBBreakpoint::GetHitCount () const
 {
diff --git a/lldb/source/API/SBBreakpointLocation.cpp b/lldb/source/API/SBBreakpointLocation.cpp
index 07300eabac4..b284f6a2341 100644
--- a/lldb/source/API/SBBreakpointLocation.cpp
+++ b/lldb/source/API/SBBreakpointLocation.cpp
@@ -99,6 +99,18 @@ SBBreakpointLocation::SetIgnoreCount (uint32_t n)
 }
 
 void
+SBBreakpointLocation::SetCondition (const char *condition)
+{
+    m_opaque_sp->SetCondition (condition);
+}
+
+const char *
+SBBreakpointLocation::GetCondition ()
+{
+    return m_opaque_sp->GetConditionText ();
+}
+
+void
 SBBreakpointLocation::SetThreadID (tid_t thread_id)
 {
     if (m_opaque_sp)