Workaround LLDB-MI =breakpoint-modified quirk

We ignore modified breakpoint/watchpoint conditions received via a
=breakpoint-modified async event record from LLDB-MI. The "cond" field
of these records is not reliable at present.

Author: jld01

dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2018 Mentor Graphics and others.
+ * Copyright (c) 2012, 2025 Mentor Graphics and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -16,6 +16,7 @@
  *      Jonah Graham (Kichwa Coders) - Bug 317173 - cleanup warnings
  *      Jonah Graham (Kichwa Coders) - Bug 530377 - Corruption of state due to fast events from GDB
  *      Umair Sair (Siemens) - Bug 571161 - MIBreakpointsSynchronizer is broken in certain scenarios
+ *      John Dallaway - Allow override of breakpoint condition modified check (#1319)
  *******************************************************************************/
 
 package org.eclipse.cdt.dsf.mi.service;
@@ -222,7 +223,7 @@ private void doInitialize(final RequestMonitor rm) {
 		getSession().addServiceEventListener(this, null);
 
 		// Register this service
-		register(new String[] { MIBreakpointsSynchronizer.class.getName() }, new Hashtable<String, String>());
+		register(new String[] { MIBreakpointsSynchronizer.class.getName() }, new Hashtable<>());
 
 		rm.done();
 	}
@@ -746,6 +747,11 @@ protected void handleSuccess() {
 		});
 	}
 
+	/** @since 7.3 */
+	protected boolean isTargetBreakpointConditionModified(MIBreakpoint miBpt, String condition) {
+		return !condition.equals(miBpt.getCondition());
+	}
+
 	private void targetBreakpointModified(IBreakpointsTargetDMContext bpTargetDMC, ICBreakpoint plBpt,
 			MIBreakpoint miBpt) {
 		Map<String, MIBreakpointDMData> contextBreakpoints = getBreakpointsService().getBreakpointMap(bpTargetDMC);
@@ -755,7 +761,7 @@ private void targetBreakpointModified(IBreakpointsTargetDMContext bpTargetDMC, I
 			if (plBpt.isEnabled() != miBpt.isEnabled()) {
 				plBpt.setEnabled(miBpt.isEnabled());
 			}
-			if (!plBpt.getCondition().equals(miBpt.getCondition())) {
+			if (isTargetBreakpointConditionModified(miBpt, plBpt.getCondition())) {
 				plBpt.setCondition(miBpt.getCondition());
 			}
 			// oldData can be null for notifications of breakpoints that are inserted using DSF but

llvm/org.eclipse.cdt.llvm.dsf.lldb.core/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.cdt.llvm.dsf.lldb.core;singleton:=true
-Bundle-Version: 1.102.400.qualifier
+Bundle-Version: 1.102.500.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.debug.core;bundle-version="[3.23.0,4)",

llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/service/LLDBBreakpointsSynchronizer.java

@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2025 John Dallaway and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ * Contributors:
+ *     John Dallaway - Initial implementation (#1319)
+ *******************************************************************************/
+
+package org.eclipse.cdt.llvm.dsf.lldb.core.internal.service;
+
+import org.eclipse.cdt.dsf.mi.service.MIBreakpointsSynchronizer;
+import org.eclipse.cdt.dsf.mi.service.command.output.MIBreakpoint;
+import org.eclipse.cdt.dsf.service.DsfSession;
+
+public class LLDBBreakpointsSynchronizer extends MIBreakpointsSynchronizer {
+
+	public LLDBBreakpointsSynchronizer(DsfSession session) {
+		super(session);
+	}
+
+	@Override
+	protected boolean isTargetBreakpointConditionModified(MIBreakpoint miBpt, String condition) {
+		// assume not modified due to =breakpoint-modified async record issue:
+		// https://github.com/lldb-tools/lldb-mi/issues/125
+		return false;
+	}
+
+}

llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/service/LLDBServiceFactory.java

@@ -11,6 +11,7 @@
  * Contributors:
  *     Ericsson - Initial implementation
  *     John Dallaway - Use LLDB memory service (#1191)
+ *     John Dallaway - Use LLDB breakpoints synchronizer service (#1319)
  *******************************************************************************/
 
 package org.eclipse.cdt.llvm.dsf.lldb.core.internal.service;
@@ -21,6 +22,7 @@
 import org.eclipse.cdt.dsf.debug.service.IRunControl;
 import org.eclipse.cdt.dsf.debug.service.command.ICommandControl;
 import org.eclipse.cdt.dsf.gdb.service.GdbDebugServicesFactory;
+import org.eclipse.cdt.dsf.mi.service.MIBreakpointsSynchronizer;
 import org.eclipse.cdt.dsf.service.DsfSession;
 import org.eclipse.cdt.llvm.dsf.lldb.core.internal.service.commands.LLDBCommandFactory;
 import org.eclipse.debug.core.ILaunchConfiguration;
@@ -67,4 +69,9 @@ protected IMemory createMemoryService(DsfSession session) {
 		return new LLDBMemory(session);
 	}
 
+	@Override
+	protected MIBreakpointsSynchronizer createBreakpointsSynchronizerService(DsfSession session) {
+		return new LLDBBreakpointsSynchronizer(session);
+	}
+
 }