[PATCHv4,2/7] gdb: fixes for code_breakpoint::disabled_by_cond logic

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 0a889a04e81..7b84126c241 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -13016,8 +13016,7 @@  update_breakpoint_locations (code_breakpoint *b,
 
   for (const bp_location &e : existing_locations)
     {
-      if (e.function_name == nullptr
-	  || (e.enabled && !e.disabled_by_cond))
+      if (e.function_name == nullptr || e.enabled)
 	continue;
 
       if (have_ambiguous_names)
@@ -13034,7 +13033,6 @@  update_breakpoint_locations (code_breakpoint *b,
 	      if (breakpoint_locations_match (&e, &l, true))
 		{
 		  l.enabled = e.enabled;
-		  l.disabled_by_cond = e.disabled_by_cond;
 		  break;
 		}
 	    }
@@ -13047,7 +13045,6 @@  update_breakpoint_locations (code_breakpoint *b,
 			   l.function_name.get ()) == 0)
 	      {
 		l.enabled = e.enabled;
-		l.disabled_by_cond = e.disabled_by_cond;
 		break;
 	      }
 	}
diff --git a/gdb/solib.c b/gdb/solib.c
index fdefdf0b142..0c63d31f645 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -973,7 +973,7 @@  solib_add (const char *pattern, int from_tty, int readsyms)
 	    }
 	}
 
-    if (loaded_any_symbols)
+    if (loaded_any_symbols || !current_program_space->deleted_solibs.empty ())
       breakpoint_re_set ();
 
     if (from_tty && pattern && !any_matches)
diff --git a/gdb/testsuite/gdb.base/bp-disabled-by-cond-lib.c b/gdb/testsuite/gdb.base/bp-disabled-by-cond-lib.c
new file mode 100644
index 00000000000..ab0cb9dcb16
--- /dev/null
+++ b/gdb/testsuite/gdb.base/bp-disabled-by-cond-lib.c
@@ -0,0 +1,24 @@ 
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2024 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+volatile int lib_global = 0;
+
+void
+lib_func (void)
+{
+  /* Nothing.  */
+}
diff --git a/gdb/testsuite/gdb.base/bp-disabled-by-cond.c b/gdb/testsuite/gdb.base/bp-disabled-by-cond.c
new file mode 100644
index 00000000000..cf61c2821df
--- /dev/null
+++ b/gdb/testsuite/gdb.base/bp-disabled-by-cond.c
@@ -0,0 +1,64 @@ 
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2024 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <assert.h>
+#include <stdlib.h>
+
+#ifdef __WIN32__
+#include <windows.h>
+#define dlopen(name, mode) LoadLibrary (TEXT (name))
+#ifdef _WIN32_WCE
+# define dlsym(handle, func) GetProcAddress (handle, TEXT (func))
+#else
+# define dlsym(handle, func) GetProcAddress (handle, func)
+#endif
+#define dlclose(handle) FreeLibrary (handle)
+#else
+#include <dlfcn.h>
+#endif
+
+void
+breakpt ()
+{
+  /* Nothing.  */
+}
+
+int
+main (void)
+{
+  int res;
+  void *handle;
+  void (*func) (void);
+
+  handle = dlopen (SHLIB_NAME, RTLD_LAZY);
+  assert (handle != NULL);
+
+  func = (void (*)(void)) dlsym (handle, "lib_func");
+  assert (func != NULL);
+
+  breakpt ();	/* Conditional BP location.  */
+  breakpt ();	/* Other BP location.  */
+
+  func ();
+
+  res = dlclose (handle);
+  assert (res == 0);
+
+  breakpt ();	/* BP before exit.  */
+
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.base/bp-disabled-by-cond.exp b/gdb/testsuite/gdb.base/bp-disabled-by-cond.exp
new file mode 100644
index 00000000000..6104787ed3a
--- /dev/null
+++ b/gdb/testsuite/gdb.base/bp-disabled-by-cond.exp
@@ -0,0 +1,206 @@ 
+# Copyright 2024 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Breakpoint locations can be marked as "disabled due to their
+# condition".  This test sets up a breakpoint which depends on reading
+# a variable in a shared library.  We then check that the b/p is
+# correctly disabled before the shared library is loaded, becomes
+# enabled once the shared library is loaded.  And becomes disabled
+# again when the shared libraries are unloaded.
+
+standard_testfile .c -lib.c
+
+set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py]
+
+# Build the library and copy it to the target.
+set libname ${testfile}-lib
+set libfile [standard_output_file $libname]
+if { [build_executable "build shlib" $libfile $srcfile2 {debug shlib}] == -1} {
+    return
+}
+set libfile_on_target [gdb_download_shlib $libfile]
+
+# Build the executable.
+set opts [list debug shlib_load additional_flags=-DSHLIB_NAME=\"${libname}\"]
+if { [build_executable "build exec" $binfile $srcfile $opts] == -1} {
+    return
+}
+
+set other_bp_line [gdb_get_line_number "Other BP location" $srcfile]
+set cond_bp_line [gdb_get_line_number "Conditional BP location" $srcfile]
+set exit_bp_line [gdb_get_line_number "BP before exit" $srcfile]
+
+# Setup a conditional b/p, the condition of which depends on reading a
+# variable from a shared library.  The b/p will initially be created
+# disabled (due to the condition).
+#
+# Continue the inferior, when the shared library is loaded GDB should
+# make the b/p enabled.
+#
+# Restart the inferior, which should unload the shared library, GDB
+# should mark the b/p as disabled due to its condition again.
+proc run_test { hit_cond } {
+    clean_restart $::binfile
+
+    if {![runto_main]} {
+	return
+    }
+
+    # Setup breakpoints.
+    gdb_breakpoint $::srcfile:$::other_bp_line
+    set other_bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \
+			  "get number of other b/p"]
+
+    gdb_breakpoint $::srcfile:$::exit_bp_line
+    set exit_bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \
+			 "get number of exit b/p"]
+
+    gdb_breakpoint $::srcfile:$::cond_bp_line
+    set cond_bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \
+			"get number of conditional b/p"]
+
+    if { $hit_cond } {
+	set lib_global_val 0
+    } else {
+	set lib_global_val 1
+    }
+
+    # Set the condition.  Use 'force' as we're referencing a variable in
+    # the shared library, which hasn't been loaded yet.  The breakpoint
+    # will immediately be marked as disabled_by_cond.
+    gdb_test "condition -force $cond_bp_num lib_global == $lib_global_val" \
+	[multi_line \
+	     "warning: failed to validate condition at location $cond_bp_num\\.1, disabling:" \
+	     "  No symbol \"lib_global\" in current context\\."] \
+	"set b/p condition, it will be disabled"
+
+    # Source Python script if supported.
+    if { [allow_python_tests] } {
+	gdb_test_no_output "source $::pyfile" "import python scripts"
+	gdb_test "python print(bp_modified_list)" "\\\[\\\]" \
+	    "check b/p modified observer has not yet triggered"
+    }
+
+    # Check the b/p is indeed marked as disabled (based on its condition).
+    gdb_test "info breakpoint $cond_bp_num" \
+	[multi_line \
+	     "\r\n$cond_bp_num\\.1\\s+N\\*\\s+$::hex in main at \[^\r\n\]+" \
+	     "\\(\\*\\): Breakpoint condition is invalid at this location\\."] \
+	"conditional breakpoint is disabled based on condition"
+
+    if { $hit_cond } {
+	# Continue the inferior.  The shared library is loaded and the
+	# breakpoint condition should become valid.  We should then stop at
+	# the conditional breakpoint.
+	gdb_test "continue" \
+	    [multi_line \
+		 "Breakpoint $cond_bp_num, main \\(\\) at \[^\r\n\]+:$::cond_bp_line" \
+		 "$::cond_bp_line\\s+breakpt \\(\\);\\s+/\\* Conditional BP location\\.  \\*/"] \
+	    "continue until conditional b/p is hit"
+    } else {
+	# Continue the inferior.  The shared library is loaded and the
+	# breakpoint condition should become valid.  As the condition
+	# is going to be false GDB will stop at the other line.
+	gdb_test "continue" \
+	    [multi_line \
+		 "Breakpoint $other_bp_num, main \\(\\) at \[^\r\n\]+:$::other_bp_line" \
+		 "$::other_bp_line\\s+breakpt \\(\\);\\s+/\\* Other BP location\\.  \\*/"] \
+	    "continue until conditional b/p is hit"
+    }
+
+    if { [allow_python_tests] } {
+	# We're going to look at the list of b/p that have been
+	# modified since we loaded the Python script.  The first b/p
+	# modified will be the conditional b/p, this occurs when the
+	# b/p condition became valid.
+	#
+	# The second b/p will be whichever b/p we hit (the hit count
+	# increased).  So figure out which b/p we are going to hit.
+	if { $hit_cond } {
+	    set second_bp_num $cond_bp_num
+	} else {
+	    set second_bp_num $other_bp_num
+	}
+
+	# Now check the list of modified b/p.
+	gdb_test "python print(bp_modified_list)" \
+	    "\\\[$cond_bp_num, $second_bp_num\\\]" \
+	    "check b/p modified observer was triggered"
+    }
+
+    if {[gdb_protocol_is_remote]} {
+	set evals_re "(?: \\(\[^) \]+ evals\\))?"
+    } else {
+	set evals_re ""
+    }
+
+    # Check the b/p is no longer marked as disabled.  The output is
+    # basically the same here whether the b/p was hit or not.  It's
+    # just the hit counter line that we need to append or not.
+    set re_list \
+	[list \
+	     "$cond_bp_num\\s+breakpoint\\s+keep\\s+y\\s+$::hex in main at \[^\r\n\]+:$::cond_bp_line" \
+	     "\\s+stop only if lib_global == $lib_global_val$evals_re"]
+    if { $hit_cond } {
+	lappend re_list "\\s+breakpoint already hit 1 time"
+    }
+    set re [multi_line {*}$re_list]
+    gdb_test "info breakpoint $cond_bp_num" $re \
+	"conditional breakpoint is now enabled"
+
+    if { $hit_cond } {
+	gdb_test "continue" \
+	    [multi_line \
+		 "Breakpoint $other_bp_num, main \\(\\) at \[^\r\n\]+:$::other_bp_line" \
+		 "$::other_bp_line\\s+breakpt \\(\\);\\s+/\\* Other BP location\\.  \\*/"] \
+	    "continue to other b/p"
+    }
+
+    if {[allow_python_tests]} {
+	# Clear out the list of modified b/p.  This makes the results
+	# (see below) clearer.
+	gdb_test_no_output "python bp_modified_list=\[\]" \
+	    "clear bp_modified_list"
+    }
+
+    gdb_test "continue" \
+	[multi_line \
+	     "Breakpoint $exit_bp_num, main \\(\\) at \[^\r\n\]+:$::exit_bp_line" \
+	     "$::exit_bp_line\\s+breakpt \\(\\);\\s+/\\* BP before exit\\.  \\*/"] \
+	"continue b/p before exit"
+
+    # Check the b/p is once again marked as disabled based on its
+    # condition.
+    gdb_test "info breakpoint $cond_bp_num" \
+	[multi_line \
+	     "\r\n$cond_bp_num\\.1\\s+N\\*\\s+$::hex in main at \[^\r\n\]+" \
+	     "\\(\\*\\): Breakpoint condition is invalid at this location\\."] \
+	"conditional breakpoint is again disabled based on condition"
+
+    if { [allow_python_tests] } {
+	# The condition breakpoint will have been modified (moved to
+	# the disabled state) when GDB unloaded the shared libraries.
+	# And the b/p in main will have been modified in that it's hit
+	# count will have gone up.
+	gdb_test "python print(bp_modified_list)" \
+	    "\\\[$cond_bp_num, $exit_bp_num\\\]" \
+	    "check b/p modified observer was triggered during restart"
+    }
+}
+
+# The tests.
+foreach_with_prefix hit_cond { true false } {
+    run_test $hit_cond
+}
diff --git a/gdb/testsuite/gdb.base/bp-disabled-by-cond.py b/gdb/testsuite/gdb.base/bp-disabled-by-cond.py
new file mode 100644
index 00000000000..87b374c201e
--- /dev/null
+++ b/gdb/testsuite/gdb.base/bp-disabled-by-cond.py
@@ -0,0 +1,21 @@ 
+# Copyright (C) 2024 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+bp_modified_list = []
+
+def bp_modified(bp):
+    bp_modified_list.append (bp.number)
+
+gdb.events.breakpoint_modified.connect(bp_modified)
diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
index 1316d92b116..a01cb712887 100644
--- a/gdb/testsuite/gdb.trace/change-loc.exp
+++ b/gdb/testsuite/gdb.trace/change-loc.exp
@@ -149,6 +149,7 @@  proc tracepoint_change_loc_1 { trace_type } {
 (4\.\[1-3].* in func4.*\tinstalled on target.*){2}" \
 	    "tracepoint with two locations - installed (unload)"
 
+	setup_kfail gdb/32404 "*-*-*"
 	gdb_test "info trace" \
 	    "Num     Type\[ \]+Disp Enb Address\[ \]+What.*
 \[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\<MULTIPLE\>.*
@@ -263,6 +264,7 @@  proc tracepoint_change_loc_2 { trace_type } {
 (1\.\[1-3].* in func4.*\tinstalled on target.*){2}" \
 	    "tracepoint with two locations - installed (unload)"
 
+	setup_kfail gdb/32404 "*-*-*"
 	gdb_test "info trace" \
 	    "Num     Type\[ \]+Disp Enb Address\[ \]+What.*
 \[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\<MULTIPLE\>.*