From 4ba131bdd6ef2368a38de084633e9435b0fe6657 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 22 Apr 2020 14:34:31 +0200
Subject: [PATCH] Debugger: Handle failed breakpoints as unclaimed

Change-Id: I02a44db5391b174e75fc326ce217b271ee73c464
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/breakhandler.cpp | 5 +++++
 src/plugins/debugger/breakhandler.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 023d0120cc9..d8b82cd571d 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1330,7 +1330,12 @@ void DebuggerEngine::notifyBreakpointInsertOk(const Breakpoint &bp)
 void DebuggerEngine::notifyBreakpointInsertFailed(const Breakpoint &bp)
 {
     QTC_ASSERT(bp, return);
+    GlobalBreakpoint gbp = bp->globalBreakpoint();
     bp->gotoState(BreakpointDead, BreakpointInsertionProceeding);
+    breakHandler()->removeDisassemblerMarker(bp);
+    breakHandler()->destroyItem(bp);
+    QTC_ASSERT(gbp, return);
+    gbp->updateMarker();
 }
 
 void DebuggerEngine::notifyBreakpointRemoveProceeding(const Breakpoint &bp)
diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h
index 55a4bfd9bd2..f0ee77b8727 100644
--- a/src/plugins/debugger/breakhandler.h
+++ b/src/plugins/debugger/breakhandler.h
@@ -93,6 +93,7 @@ private:
     friend class BreakHandler;
     friend class BreakpointManager;
     friend class BreakpointMarker;
+    friend class DebuggerEngine;
 
     void updateMarker();
     void updateMarkerIcon();