Hi, the patch has no effect on the functionality but I find the simplified code less magic to understand. It fixes a small bug - update_watchpoint() for bp_watchpoint (software watchpoint) created breakpoint locations bp_loc_hardware_watchpoint while it should be bp_loc_other. But I am not aware of any (possibly negative) effect it had. No regressions on {x86_64,ia64}-unknown-linux-gnu. Regards, Jan