[lldb-mi] Implement -gdb-set breakpoint pending on/off

[malaperle]

Summary

This allows creating pending breakpoint automatically when a location is not found.
This is used by some front-ends instead of doing "-break-insert -f" every time.

See also https://sourceware.org/gdb/onlinedocs/gdb/Set-Breaks.html

Signed-off-by: Marc-Andre Laperle <[e-mail]>

[malaperle]

Gentle ping?

[MaskRay]

tools/lldb-mi/MICmdCmdGdbSet.cpp

447

clang-format

[MaskRay]

And there is no reviewers set :)

[malaperle]

In D52953#1268810, @MaskRay wrote:

And there is no reviewers set :)

I don't know who to add.

[jingham]

This looks okay to me, there's a trivial comment nit... But Alexander has been doing the most work on MI recently, he might want to give this a look-over.

[malaperle]

Clang-format it

[apolyakov]

I think that it's worth it to rewrite the test with LIT and FileCheck because the python approach has some limitations, e.g. timeouts. You can find examples in lldb/lit/tools/lldb-mi/.

tools/lldb-mi/MICmdCmdGdbShow.cpp

369

Following LLVM coding standarts, we should use early exits. In this case it might be like:

if (!CMIUtilString::Compare(strOption, "pending")) {
  // process error here
}
// success case here
...

[malaperle]

Convert to lit test, convert some code to an early return, clang-format.

[apolyakov]

lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test

4 ↗

(On Diff #171388)

As far as your first command is file-exec-and-symbols, the best way is to use a generic executable's name. Here it should be:

# RUN: %cc -o %t %p/inputs/break-insert-pending.c -g
# RUN: %lldbmi %t < %s | FileCheck %s

9 ↗

(On Diff #171388)

It might be removed then.

20 ↗

(On Diff #171388)

It should be # CHECK:, it will not work otherwise.

The same comment for other places.

[malaperle]

Fixes to lit test

[malaperle]

lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test

4 ↗

(On Diff #171388)

How can I use %t for the second file-exec-and-symbols? It doesn't seem to work

[apolyakov]

I ran the test and got a fail:

build/bin/llvm-lit -avv llvm/tools/lldb/lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test 
-- Testing: 1 tests, 1 threads --
FAIL: lldb :: tools/lldb-mi/breakpoint/break-insert-enable-pending.test (1 of 1)
******************** TEST 'lldb :: tools/lldb-mi/breakpoint/break-insert-enable-pending.test' FAILED ********************
Script:
--
: 'RUN: at line 4';   /home/alexander/workspace/gsoc/build/./bin/clang -o b.exe /home/alexander/workspace/gsoc/llvm/tools/lldb/lit/tools/lldb-mi/breakpoint/inputs/break-insert-pending.c -g
: 'RUN: at line 5';   /home/alexander/workspace/gsoc/build/bin/lldb-mi --synchronous < /home/alexander/workspace/gsoc/llvm/tools/lldb/lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test | /home/alexander/workspace/gsoc/build/bin/FileCheck /home/alexander/workspace/gsoc/llvm/tools/lldb/lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test
--
Exit Code: 1

Command Output (stderr):
--
/home/alexander/workspace/gsoc/llvm/tools/lldb/lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test:25:10: error: CHECK: expected string not found in input
# CHECK: =breakpoint-modified,bkpt={number="2",type="breakpoint",disp="keep",enabled="y",addr="{{0x[0-9a-f]*[^f][0-9a-f]*}}",func="??",file="??",fullname="??/??",line="0",pending=["printf"],times="{{0|1}}",original-location="printf"}
         ^
<stdin>:40:1: note: scanning from here
=thread-group-started,id="i1",pid="11020"
^

--

********************
Testing Time: 0.72s
********************
Failing Tests (1):
    lldb :: tools/lldb-mi/breakpoint/break-insert-enable-pending.test

  Unexpected Failures: 1

lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test

4 ↗

(On Diff #171388)

Should you use file-exec-and-symbols two times? AFAIK, after exiting a program, your target remains the same, so you don't need to load it again.

[malaperle]

In D52953#1278331, @apolyakov wrote:

I ran the test and got a fail:

Can you paste the full input of the failure? You can add "--dump-input-on-failure" arg to FileCheck in the test. The test passes for me but it might be that a regex needs to be tweaked depending on the environment.

[malaperle]

lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test

4 ↗

(On Diff #171388)

I did that so that printf would not be resolved in order to test that it behaves properly after turning off pending breakpoints. But I can -break-insert printf on a different, non-existent symbol and it should be OK I think.

[malaperle]

Remove need for second -file-exec-and-symbols

[apolyakov]

This comment was removed by apolyakov.

[apolyakov]

Here it is:

build/bin/llvm-lit -avv llvm/tools/lldb/lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test -- Testing: 1 tests, 1 threads --
FAIL: lldb :: tools/lldb-mi/breakpoint/break-insert-enable-pending.test (1 of 1)
******************** TEST 'lldb :: tools/lldb-mi/breakpoint/break-insert-enable-pending.test' FAILED ********************
Script:
--
: 'RUN: at line 4';   /home/alexander/workspace/gsoc/build/./bin/clang -o /home/alexander/workspace/gsoc/build/tools/lldb/lit/tools/lldb-mi/breakpoint/Output/break-insert-enable-pending.test.tmp /home/alexander/workspace/gsoc/llvm/tools/lldb/lit/tools/lldb-mi/breakpoint/inputs/break-insert-pending.c -g
: 'RUN: at line 5';   /home/alexander/workspace/gsoc/build/bin/lldb-mi --synchronous /home/alexander/workspace/gsoc/build/tools/lldb/lit/tools/lldb-mi/breakpoint/Output/break-insert-enable-pending.test.tmp < /home/alexander/workspace/gsoc/llvm/tools/lldb/lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test | /home/alexander/workspace/gsoc/build/bin/FileCheck /home/alexander/workspace/gsoc/llvm/tools/lldb/lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test --dump-input-on-failure
--
Exit Code: 1

Command Output (stderr):
--
/home/alexander/workspace/gsoc/llvm/tools/lldb/lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test:22:10: error: CHECK: expected string not found in input
# CHECK: =breakpoint-modified,bkpt={number="2",type="breakpoint",disp="keep",enabled="y",addr="{{0x[0-9a-f]*[^f][0-9a-f]*}}",func="??",file="??",fullname="??/??",line="0",pending=["printf"],times="{{0|1}}",original-location="printf"}
         ^
<stdin>:39:1: note: scanning from here
=thread-group-started,id="i1",pid="5022"
^
Full input was:
<<<<<<
(gdb)
-file-exec-and-symbols "/home/alexander/workspace/gsoc/build/tools/lldb/lit/tools/lldb-mi/breakpoint/Output/break-insert-enable-pending.test.tmp"
^done
(gdb)
^done
(gdb)
=library-loaded,id="/home/alexander/workspace/gsoc/build/tools/lldb/lit/tools/lldb-mi/breakpoint/Output/break-insert-enable-pending.test.tmp",target-name="/home/alexander/workspace/gsoc/build/tools/lldb/lit/tools/lldb-mi/breakpoint/Output/break-insert-enable-pending.test.tmp",host-name="/home/alexander/workspace/gsoc/build/tools/lldb/lit/tools/lldb-mi/breakpoint/Output/break-insert-enable-pending.test.tmp",symbols-loaded="0",loaded_addr="-",size="0"
^done
(gdb)
^done
(gdb)
^done
(gdb)
^done
(gdb)
^done
(gdb)
^error,msg="Command 'break-insert'. Breakpoint location 'printf' not found"
(gdb)
^done
(gdb)
^done
(gdb)
^done
(gdb)
^done,value="on"
(gdb)
^done
(gdb)
^done,bkpt={number="2",type="breakpoint",disp="keep",enabled="y",addr="0xffffffffffffffff",func="??",file="??",fullname="??/??",line="0",pending=["printf"],times="0",original-location="printf"}
(gdb)
=breakpoint-modified,bkpt={number="2",type="breakpoint",disp="keep",enabled="y",addr="0xffffffffffffffff",func="??",file="??",fullname="??/??",line="0",pending=["printf"],times="0",original-location="printf"}
(gdb)
^done
(gdb)
^done
(gdb)
^running
=thread-group-started,id="i1",pid="5022"
(gdb)
=thread-created,id="1",group-id="i1"
=thread-selected,id="1"
(gdb)
=library-loaded,id="/lib/x86_64-linux-gnu/ld-2.23.so",target-name="/lib/x86_64-linux-gnu/ld-2.23.so",host-name="/lib/x86_64-linux-gnu/ld-2.23.so",symbols-loaded="1",symbols-path="/usr/lib/debug/lib/x86_64-linux-gnu/ld-2.23.so",loaded_addr="-",size="0"
(gdb)
=library-loaded,id="[vdso]",target-name="[vdso]",host-name="[vdso]",symbols-loaded="1",symbols-path="",loaded_addr="0x00007ffff7ffa000",size="0"
(gdb)
=library-loaded,id="/home/alexander/workspace/gsoc/build/tools/lldb/lit/tools/lldb-mi/breakpoint/Output/break-insert-enable-pending.test.tmp",target-name="/home/alexander/workspace/gsoc/build/tools/lldb/lit/tools/lldb-mi/breakpoint/Output/break-insert-enable-pending.test.tmp",host-name="/home/alexander/workspace/gsoc/build/tools/lldb/lit/tools/lldb-mi/breakpoint/Output/break-insert-enable-pending.test.tmp",symbols-loaded="0",loaded_addr="-",size="0"
1 location added to breakpoint 2
(gdb)
=library-loaded,id="/lib/x86_64-linux-gnu/libc.so.6",target-name="/lib/x86_64-linux-gnu/libc.so.6",host-name="/lib/x86_64-linux-gnu/libc.so.6",symbols-loaded="1",symbols-path="/usr/lib/debug/lib/x86_64-linux-gnu/libc-2.23.so",loaded_addr="-",size="0"
=breakpoint-modified,bkpt={number="2",type="breakpoint",disp="keep",enabled="y",addr="0x00007ffff7a6285b",func="__printf",file="printf.c",fullname="/build/glibc-bfm8X4/glibc-2.23/stdio-common/printf.c",line="32",pending=["printf"],times="1",original-location="printf"}
(gdb)
(gdb)
=library-loaded,id="/lib/x86_64-linux-gnu/libc.so.6",target-name="/lib/x86_64-linux-gnu/libc.so.6",host-name="/lib/x86_64-linux-gnu/libc.so.6",symbols-loaded="1",symbols-path="/usr/lib/debug/lib/x86_64-linux-gnu/libc-2.23.so",loaded_addr="-",size="0"
(gdb)
*stopped,reason="breakpoint-hit",disp="del",bkptno="2",frame={level="0",addr="0x00007ffff7a6285b",func="__printf",args=[{name="format",value="0x00000000004005d4 \"Print a formatted string so that GCC does not optimize this printf call: %s\\\\n\""}],file="printf.c",fullname="/build/glibc-bfm8X4/glibc-2.23/stdio-common/printf.c",line="32"},thread-id="1",stopped-threads="all"
(gdb)
^done
(gdb)
^done
(gdb)
^done
(gdb)
^done
(gdb)
=breakpoint-modified,bkpt={number="2",type="breakpoint",disp="keep",enabled="n",addr="0x00007ffff7a6285b",func="__printf",file="printf.c",fullname="/build/glibc-bfm8X4/glibc-2.23/stdio-common/printf.c",line="32",pending=["printf"],times="1",original-location="printf"}
(gdb)
^done
(gdb)
^done
(gdb)
^running
(gdb)
@"Print a formatted string so that GCC does not optimize this printf call: /home/alexander/workspace/gsoc/build/tools/lldb/lit/tools/lldb-mi/breakpoint/Output/break-insert-enable-pending.test.tmp\r\n"
(gdb)
=thread-exited,id="1",group-id="i1"
=thread-group-exited,id="i1",exit-code="0"
*stopped,reason="exited-normally"
(gdb)
^done
(gdb)
^done
(gdb)
^done
(gdb)
^done,value="on"
(gdb)
^done
(gdb)
^done
(gdb)
^done
(gdb)
^done,value="off"
(gdb)
^done
(gdb)
^error,msg="Command 'break-insert'. Breakpoint location 'printf-non-existent' not found"
(gdb)
^done
(gdb)
^done
(gdb)
^done
(gdb)
^done
(gdb)
^done,value="on"
(gdb)
^done
(gdb)
^done
(gdb)
^done
(gdb)
^done,value="off"
(gdb)
^done
(gdb)
^error,msg="'breakpoint' expects "pending on" or "pending off""
(gdb)
^done
(gdb)

>>>>>>

--

********************
Testing Time: 0.70s
********************
Failing Tests (1):
    lldb :: tools/lldb-mi/breakpoint/break-insert-enable-pending.test

  Unexpected Failures: 1

[malaperle]

Simply checks

I think those =breakpoint-modified checks are a bit overzealous. The important
check is whether of not we hit the breakpoint in a resolved location,
i.e. not 0xffffffff. So, at the *stopped. The presence and timing of

breakpoint-modified is orthogonal to this patch.

[malaperle]

In D52953#1278491, @malaperle wrote:

Simply checks

*Simplify

[apolyakov]

LGTM.

[malaperle]

In D52953#1278523, @apolyakov wrote:

LGTM.

Thanks a lot!

packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py

def test_lldbmi_break_insert_function_pending(self):
         self.runCmd("-exec-run")
         self.expect("\^running")
         self.expect(
             "=breakpoint-modified,bkpt={number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"(?!0xffffffffffffffff)0x[0-9a-f]+\",func=\".+?\",file=\".+?\",fullname=\".+?\",line=\"(-1|\d+)\",pending=\[\"printf\"\],times=\"0\",original-location=\"printf\"}")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
     @skipIfWindows  # llvm.org/pr24452: Get lldb-mi tests working on Windows
     @skipIfFreeBSD  # llvm.org/pr22411: Failure presumably due to known thread races
+    @expectedFlakeyLinux("llvm.org/pr24717")
+    @skipIfRemote   # We do not currently support remote debugging via the MI.
+    def test_lldbmi_break_insert_enable_pending(self):
+        """Test that 'lldb-mi --interpreter' works for enabling pending breakpoints globally."""
+
+        self.spawnLldbMi(args=None)
+
+        self.runCmd("-file-exec-and-symbols %s" % self.myexe)
+        self.expect("\^done")
+
+        self.runCmd("-break-insert printf")
+        self.expect(
+            "\^error,msg=\"Command 'break-insert'. Breakpoint location 'printf' not found\"")
+        self.runCmd("-gdb-set breakpoint pending on")
+        self.expect("\^done")
+        self.runCmd("-gdb-show breakpoint pending")
+        self.expect("\^done,value=\"on\"")
+        self.runCmd("-break-insert printf")
+        self.expect(
+            "\^done,bkpt={number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"0xffffffffffffffff\",func=\"\?\?\",file=\"\?\?\",fullname=\"\?\?/\?\?\",line=\"0\",pending=\[\"printf\"\],times=\"0\",original-location=\"printf\"}")
+        self.expect(
+            "=breakpoint-modified,bkpt={number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"0xffffffffffffffff\",func=\"\?\?\",file=\"\?\?\",fullname=\"\?\?/\?\?\",line=\"0\",pending=\[\"printf\"\],times=\"0\",original-location=\"printf\"}")
+
+        self.runCmd("-exec-run")
+        self.expect("\^running")
+        self.expect(
+            "=breakpoint-modified,bkpt={number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"(?!0xffffffffffffffff)0x[0-9a-f]+\",func=\".+?\",file=\".+?\",fullname=\".+?\",line=\"(-1|\d+)\",pending=\[\"printf\"\],times=\"0\",original-location=\"printf\"}")
+        self.expect("\*stopped,reason=\"breakpoint-hit\"")
+        self.runCmd("-break-disable 2")
+        self.expect("\^done")
+        self.expect(
+            "=breakpoint-modified,bkpt={number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"n\",addr=\"(?!0xffffffffffffffff)0x[0-9a-f]+\",func=\".+?\",file=\".+?\",fullname=\".+?\",line=\"(-1|\d+)\",pending=\[\"printf\"\],times=\"1\",original-location=\"printf\"}")
+        self.runCmd("-exec-continue")
+        self.expect("\^running")
+        self.expect("\*stopped,reason=\"exited-normally\"")
+
+        # Test that it can be turned back off
+        self.runCmd("-file-exec-and-symbols %s" % self.myexe)
+        self.expect("\^done")
+        self.runCmd("-gdb-show breakpoint pending")
+        self.expect("\^done,value=\"on\"")
+        self.runCmd("-gdb-set breakpoint pending off")
+        self.expect("\^done")
+        self.runCmd("-gdb-show breakpoint pending")
+        self.expect("\^done,value=\"off\"")
+        self.runCmd("-break-insert printf")
+        self.expect(
+            "\^error,msg=\"Command 'break-insert'. Breakpoint location 'printf' not found\"")
+        # Check that enable/disable with 1 and 0 works
+        self.runCmd("-gdb-set breakpoint pending 1")
+        self.expect("\^done")
+        self.runCmd("-gdb-show breakpoint pending")
+        self.expect("\^done,value=\"on\"")
+        self.runCmd("-gdb-set breakpoint pending 0")
+        self.expect("\^done")
+        self.runCmd("-gdb-show breakpoint pending")
+        self.expect("\^done,value=\"off\"")
+        self.runCmd("-gdb-set breakpoint pending garbage")
+        self.expect("\^done")
+
+
+    @skipIfWindows  # llvm.org/pr24452: Get lldb-mi tests working on Windows
+    @skipIfFreeBSD  # llvm.org/pr22411: Failure presumably due to known thread races
     @skipIfRemote   # We do not currently support remote debugging via the MI.
     def test_lldbmi_break_insert_function(self):
         """Test that 'lldb-mi --interpreter' works for function breakpoints."""
 
         self.spawnLldbMi(args=None)
 
         self.runCmd("-file-exec-and-symbols %s" % self.myexe)
         self.expect("\^done")

tools/lldb-mi/MICmdCmdBreak.cpp

if (m_bHaveArgOptionThreadGrp) {
     MIuint nThreadGrp = 0;
     pArgThreadGroup->GetExpectedOption<CMICmdArgValThreadGrp, MIuint>(
         nThreadGrp);
     m_strArgOptionThreadGrp = CMIUtilString::Format("i%d", nThreadGrp);
   }
 
   if (sbTarget == rSessionInfo.GetDebugger().GetDummyTarget())
     m_bBrkPtIsPending = true;
-  else
+  else {
     m_bBrkPtIsPending = pArgPendingBrkPt->GetFound();
+    if (!m_bBrkPtIsPending) {
+      CMIUtilString pending;
+      if (m_rLLDBDebugSessionInfo.SharedDataRetrieve("breakpoint.pending", pending)) {
+        m_bBrkPtIsPending = pending == "on";
+      }
+    }
+  }
 
   if (pArgLocation->GetFound())
     m_brkName = pArgLocation->GetValue();
   else if (m_bBrkPtIsPending) {
     pArgPendingBrkPt->GetExpectedOption<CMICmdArgValString, CMIUtilString>(
         m_brkName);
   }
   if (pArgIgnoreCnt->GetFound()) {

tools/lldb-mi/MICmdCmdGdbSet.h

 private:
   bool GetOptionFn(const CMIUtilString &vrGdbOptionName,
                    FnGdbOptionPtr &vrwpFn) const;
   bool OptionFnTargetAsync(const CMIUtilString::VecString_t &vrWords);
   bool OptionFnPrint(const CMIUtilString::VecString_t &vrWords);
   bool OptionFnSolibSearchPath(const CMIUtilString::VecString_t &vrWords);
   bool OptionFnOutputRadix(const CMIUtilString::VecString_t &vrWords);
   bool OptionFnDisassemblyFlavor(const CMIUtilString::VecString_t &vrWords);
+  bool OptionFnBreakpoint(const CMIUtilString::VecString_t &vrWords);
   bool OptionFnFallback(const CMIUtilString::VecString_t &vrWords);
 
   // Attributes:
 private:
   const static MapGdbOptionNameToFnGdbOptionPtr_t
       ms_mapGdbOptionNameToFnGdbOptionPtr;
   //
   const CMIUtilString m_constStrArgNamedGdbOption;

tools/lldb-mi/MICmdCmdGdbSet.cpp

const CMICmdCmdGdbSet::MapGdbOptionNameToFnGdbOptionPtr_t
     CMICmdCmdGdbSet::ms_mapGdbOptionNameToFnGdbOptionPtr = {
         {"target-async", &CMICmdCmdGdbSet::OptionFnTargetAsync},
         {"print", &CMICmdCmdGdbSet::OptionFnPrint},
         // { "auto-solib-add", &CMICmdCmdGdbSet::OptionFnAutoSolibAdd },    //
         // Example code if need to implement GDB set other options
         {"output-radix", &CMICmdCmdGdbSet::OptionFnOutputRadix},
         {"solib-search-path", &CMICmdCmdGdbSet::OptionFnSolibSearchPath},
         {"disassembly-flavor", &CMICmdCmdGdbSet::OptionFnDisassemblyFlavor},
-        {"fallback", &CMICmdCmdGdbSet::OptionFnFallback}};
+        {"fallback", &CMICmdCmdGdbSet::OptionFnFallback},
+        {"breakpoint", &CMICmdCmdGdbSet::OptionFnBreakpoint}};
 
 //++
 //------------------------------------------------------------------------------------
 // Details: CMICmdCmdGdbSet constructor.
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
if (error.Fail()) {
     return MIstatus::failure;
   }
 
   return MIstatus::success;
 }
 
 //++
 //------------------------------------------------------------------------------------
+// Details: Carry out work to complete the GDB set option 'breakpoint' to
+// prepare
+//          and send back information asked for.
+// Type:    Method.
+// Args:    vrWords - (R) List of additional parameters used by this option.
+// Return:  MIstatus::success - Function succeeded.
+//          MIstatus::failure - Function failed.
+// Throws:  None.
+//--
+bool CMICmdCmdGdbSet::OptionFnBreakpoint(
+                                          const CMIUtilString::VecString_t &vrWords) {
+    bool bPending = false;
+    bool bOk = true;
+
+    if (vrWords.size() != 2)
+        // Wrong number of arguments.
+        bOk = false;
+    else if (CMIUtilString::Compare(vrWords[0], "pending") && (CMIUtilString::Compare(vrWords[1], "on") || CMIUtilString::Compare(vrWords[1], "1")))
+        bPending = true;
+    else if (CMIUtilString::Compare(vrWords[0], "pending") && (CMIUtilString::Compare(vrWords[1], "off") || CMIUtilString::Compare(vrWords[1], "0")))
+        bPending = false;
+    else
+        // Unrecognized argument(s).
+        bOk = false;
+
+    if (!bOk) {
+        // Report error.
+        m_bGbbOptionFnHasError = false;
+        SetError(MIRSRC(IDS_CMD_ERR_GDBSET_OPT_BREAKPOINT));
+        return MIstatus::failure;
+    }
+
+    CMIUtilString sPendingVal = bPending ? "on" : "off";
+    CMIUtilString sKey = "breakpoint.pending";
+    if (!m_rLLDBDebugSessionInfo.SharedDataAdd(sKey, sPendingVal)) {
+        m_bGbbOptionFnHasError = false;
+        SetError(CMIUtilString::Format(MIRSRC(IDS_DBGSESSION_ERR_SHARED_DATA_ADD),
+                                       m_cmdData.strMiCmd.c_str(),
+                                       sKey.c_str()));
+        return MIstatus::failure;
+    }
+
+    return MIstatus::success;
+}
+
+//++
+//------------------------------------------------------------------------------------
 // Details: Carry out work to complete the GDB set option to prepare and send
 // back the
 //          requested information.
 // Type:    Method.
 // Args:    None.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.

tools/lldb-mi/MICmdCmdGdbShow.h

 private:
   bool GetOptionFn(const CMIUtilString &vrGdbOptionName,
                    FnGdbOptionPtr &vrwpFn) const;
   bool OptionFnTargetAsync(const CMIUtilString::VecString_t &vrWords);
   bool OptionFnPrint(const CMIUtilString::VecString_t &vrWords);
   bool OptionFnLanguage(const CMIUtilString::VecString_t &vrWords);
   bool OptionFnDisassemblyFlavor(const CMIUtilString::VecString_t &vrWords);
   bool OptionFnFallback(const CMIUtilString::VecString_t &vrWords);
+  bool OptionFnBreakpoint(const CMIUtilString::VecString_t &vrWords);
 
   // Attributes:
 private:
   const static MapGdbOptionNameToFnGdbOptionPtr_t
       ms_mapGdbOptionNameToFnGdbOptionPtr;
 
   const CMIUtilString m_constStrArgNamedGdbOption;
   bool m_bGdbOptionRecognised; // True = This command has a function with a name

tools/lldb-mi/MICmdCmdGdbShow.cpp

 
 // Instantiations:
 const CMICmdCmdGdbShow::MapGdbOptionNameToFnGdbOptionPtr_t
     CMICmdCmdGdbShow::ms_mapGdbOptionNameToFnGdbOptionPtr = {
         {"target-async", &CMICmdCmdGdbShow::OptionFnTargetAsync},
         {"print", &CMICmdCmdGdbShow::OptionFnPrint},
         {"language", &CMICmdCmdGdbShow::OptionFnLanguage},
         {"disassembly-flavor", &CMICmdCmdGdbShow::OptionFnDisassemblyFlavor},
-        {"fallback", &CMICmdCmdGdbShow::OptionFnFallback}};
+        {"fallback", &CMICmdCmdGdbShow::OptionFnFallback},
+        {"breakpoint", &CMICmdCmdGdbShow::OptionFnBreakpoint}};
 
 //++
 //------------------------------------------------------------------------------------
 // Details: CMICmdCmdGdbShow constructor.
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
bool CMICmdCmdGdbShow::OptionFnDisassemblyFlavor(const CMIUtilString::VecString_t &vrWords) {
   lldb::SBDebugger &rDbgr = m_rLLDBDebugSessionInfo.GetDebugger();
   m_strValue = lldb::SBDebugger::GetInternalVariableValue("target.x86-disassembly-flavor",
                                                           rDbgr.GetInstanceName()).GetStringAtIndex(0);
   return MIstatus::success;
 }
 
 //++
 //------------------------------------------------------------------------------------
+// Details: Carry out work to complete the GDB show option 'breakpoint' to prepare
+//          and send back the requested information.
+// Type:    Method.
+// Args:    vrWords - (R) List of additional parameters used by this option.
+// Return:  MIstatus::success - Function succeeded.
+//          MIstatus::failure - Function failed.
+// Throws:  None.
+//--
+bool CMICmdCmdGdbShow::OptionFnBreakpoint(const CMIUtilString::VecString_t &vrWords) {
+    if (vrWords.size() != 1) {
+        m_bGbbOptionFnHasError = true;
+        m_strGdbOptionFnError = MIRSRC(IDS_CMD_ERR_GDBSHOW_OPT_BREAKPOINT_BAD_ARGS);
+        return MIstatus::failure;
+    }
+
+    const CMIUtilString strOption(vrWords[0]);
+    if (CMIUtilString::Compare(strOption, "pending")) {
+        if (!m_rLLDBDebugSessionInfo.SharedDataRetrieve("breakpoint.pending", m_strValue)) {
+            if (m_strValue.empty())
+                m_strValue = "off";
+        }
+    } else {
+        m_bGbbOptionFnHasError = true;
+        m_strGdbOptionFnError = CMIUtilString::Format(
+                                                      MIRSRC(IDS_CMD_ERR_GDBSHOW_OPT_BREAKPOINT_UNKNOWN_OPTION),
+                                                      strOption.c_str());
+        return MIstatus::failure;
+    }
+
+    return MIstatus::success;
+}
+
+//++
+//------------------------------------------------------------------------------------
 // Details: Carry out work to complete the GDB show option to prepare and send
 // back the
 //          requested information.
 // Type:    Method.
 // Args:    None.
 // Return:  MIstatus::success - Function succeeded.
 //          MIstatus::failure - Function failed.
 // Throws:  None.

tools/lldb-mi/MICmnResources.h

enum {
   IDS_CMD_ERR_INVALID_FORMAT_TYPE,
   IDS_CMD_ERR_BRKPT_INFO_OBJ_NOT_FOUND,
   IDS_CMD_ERR_LLDB_ERR_WRITE_MEM_BYTES,
   IDS_CMD_ERR_LLDB_ERR_NOT_WRITE_WHOLEBLK,
   IDS_CMD_ERR_SET_NEW_DRIVER_STATE,
   IDS_CMD_ERR_INFO_PRINTFN_NOT_FOUND,
   IDS_CMD_ERR_INFO_PRINTFN_FAILED,
   IDS_CMD_ERR_GDBSET_OPT_TARGETASYNC,
+  IDS_CMD_ERR_GDBSET_OPT_BREAKPOINT,
   IDS_CMD_ERR_GDBSET_OPT_SOLIBSEARCHPATH,
   IDS_CMD_ERR_GDBSET_OPT_PRINT_BAD_ARGS,
   IDS_CMD_ERR_GDBSET_OPT_PRINT_UNKNOWN_OPTION,
   IDS_CMD_ERR_GDBSHOW_OPT_PRINT_BAD_ARGS,
   IDS_CMD_ERR_GDBSHOW_OPT_PRINT_UNKNOWN_OPTION,
+  IDS_CMD_ERR_GDBSHOW_OPT_BREAKPOINT_BAD_ARGS,
+  IDS_CMD_ERR_GDBSHOW_OPT_BREAKPOINT_UNKNOWN_OPTION,
   IDS_CMD_ERR_EXPR_INVALID,
   IDS_CMD_ERR_ATTACH_FAILED,
   IDS_CMD_ERR_ATTACH_BAD_ARGS
 };
 
 //++
 //============================================================================
 // Details: MI common code implementation class. Handle application resources

tools/lldb-mi/MICmnResources.cpp

CMICmnResources::ms_pResourceId2TextData[] = {
         {IDS_CMD_ERR_SET_NEW_DRIVER_STATE, "Command '%s'. Command tried to set "
                                            "new MI Driver running state and "
                                            "failed. %s"},
         {IDS_CMD_ERR_INFO_PRINTFN_NOT_FOUND,
          "The request '%s' was not recognised, not implemented"},
         {IDS_CMD_ERR_INFO_PRINTFN_FAILED, "The request '%s' failed."},
         {IDS_CMD_ERR_GDBSET_OPT_TARGETASYNC,
          "'target-async' expects \"on\" or \"off\""},
+        {IDS_CMD_ERR_GDBSET_OPT_BREAKPOINT,
+         "'breakpoint' expects \"pending on\" or \"pending off\""},
         {IDS_CMD_ERR_GDBSET_OPT_SOLIBSEARCHPATH,
          "'solib-search-path' requires at least one argument"},
         {IDS_CMD_ERR_GDBSET_OPT_PRINT_BAD_ARGS,
          "'print' expects option-name and \"on\" or \"off\""},
         {IDS_CMD_ERR_GDBSET_OPT_PRINT_UNKNOWN_OPTION,
          "'print' error. The option '%s' not found"},
         {IDS_CMD_ERR_GDBSHOW_OPT_PRINT_BAD_ARGS,
          "'print' expects option-name and \"on\" or \"off\""},
         {IDS_CMD_ERR_GDBSHOW_OPT_PRINT_UNKNOWN_OPTION,
          "'print' error. The option '%s' not found"},
+        {IDS_CMD_ERR_GDBSHOW_OPT_BREAKPOINT_BAD_ARGS,
+        "'breakpoint' expects option-name"},
+        {IDS_CMD_ERR_GDBSHOW_OPT_BREAKPOINT_UNKNOWN_OPTION,
+        "'breakpoint' error. The option '%s' not found"},
         {IDS_CMD_ERR_EXPR_INVALID, "Failed to evaluate expression: %s"},
         {IDS_CMD_ERR_ATTACH_FAILED,
          "Command '%s'. Attach to process failed: %s"},
         {IDS_CMD_ERR_ATTACH_BAD_ARGS,
          "Command '%s'. Must specify either a PID or a Name"}};
 
 //++
 //------------------------------------------------------------------------------------