Remove dead code, redundant checks, C++20 feature and fix Python API consistency issues

Author: 3rdit

api/python/debuggercontroller.py

@@ -382,7 +382,7 @@ def __eq__(self, other):
         if not isinstance(other, self.__class__):
             return NotImplemented
         return self.module == other.module and self.offset == other.offset and self.address == other.address \
-               and self.enabled == other.enabled and self.condition == other.condition
+               and self.enabled == other.enabled
 
     def __ne__(self, other):
         if not isinstance(other, self.__class__):
@@ -2161,9 +2161,9 @@ def set_breakpoint_condition(self, address, condition: str) -> bool:
         :return: True if successful, False otherwise
         """
         if isinstance(address, int):
-            return dbgcore.BNDebuggerSetBreakpointConditionAbsolute(self.handle, address, condition.encode('utf-8') if condition else None)
+            return dbgcore.BNDebuggerSetBreakpointConditionAbsolute(self.handle, address, condition)
         elif isinstance(address, ModuleNameAndOffset):
-            return dbgcore.BNDebuggerSetBreakpointConditionRelative(self.handle, address.module.encode('utf-8'), address.offset, condition.encode('utf-8') if condition else None)
+            return dbgcore.BNDebuggerSetBreakpointConditionRelative(self.handle, address.module, address.offset, condition)
         else:
             raise NotImplementedError
 
@@ -2177,7 +2177,7 @@ def get_breakpoint_condition(self, address) -> str:
         if isinstance(address, int):
             result = dbgcore.BNDebuggerGetBreakpointConditionAbsolute(self.handle, address)
         elif isinstance(address, ModuleNameAndOffset):
-            result = dbgcore.BNDebuggerGetBreakpointConditionRelative(self.handle, address.module.encode('utf-8'), address.offset)
+            result = dbgcore.BNDebuggerGetBreakpointConditionRelative(self.handle, address.module, address.offset)
         else:
             raise NotImplementedError
 

core/debuggercontroller.cpp

@@ -2458,9 +2458,6 @@ bool DebuggerController::EvaluateBreakpointCondition(uint64_t address)
 		return true;  // no condition means always break
 
 	const std::string condition = breakpoints->GetConditionAbsolute(address);
-	if (condition.empty())
-		return true;
-
 	uint64_t result = 0;
 	std::string errorString;
 

core/debuggercontroller.h

@@ -85,7 +85,7 @@ namespace BinaryNinjaDebugger {
 		// this does not change even if we add the debugger memory region. In the future, this should be provided by
 		// the binary view -- we will no longer need to track it ourselves
 		uint64_t m_viewStart;
-		// Original file base address before any rebasing - used for file address lookups
+		// Preserves original file base before rebasing - never updated, used for file VA to offset conversion
 		uint64_t m_originalFileBase;
 
 		//	inline static std::vector<DbgRef<DebuggerController>> g_debuggerControllers;

core/debuggerstate.cpp

@@ -27,8 +27,6 @@ limitations under the License.
 #include "debugadapter.h"
 #include "debuggercontroller.h"
 
-#include <ranges>
-
 using namespace BinaryNinja;
 using namespace std;
 using namespace BinaryNinjaDebugger;
@@ -747,7 +745,7 @@ std::optional<ModuleNameAndOffset> DebuggerBreakpoints::FindConditionKey(const M
 	// absolute address comparison (handles module name differences)
 	// assumes conditions are stored with valid, resolvable module names
 	const uint64_t targetAbsolute = m_state->GetModules()->RelativeAddressToAbsolute(address);
-	for (const auto& key : m_conditions | views::keys)
+	for (const auto& [key, _] : m_conditions)
 	{
 		if (const uint64_t conditionAbsolute = m_state->GetModules()->RelativeAddressToAbsolute(key);
 			conditionAbsolute == targetAbsolute)
@@ -763,7 +761,7 @@ std::optional<ModuleNameAndOffset> DebuggerBreakpoints::FindConditionKey(const M
 		{
 			const uint64_t fileOffset = address.offset - originalBase;
 			const std::string& mainFile = m_state->GetController()->GetData()->GetFile()->GetOriginalFilename();
-			for (const auto& key : m_conditions | views::keys)
+			for (const auto& [key, _] : m_conditions)
 			{
 				if (key.offset == fileOffset && DebugModule::IsSameBaseModule(mainFile, key.module))
 					return key;
@@ -805,23 +803,6 @@ bool DebuggerBreakpoints::HasConditionOffset(const ModuleNameAndOffset& address)
 }
 
 
-void DebuggerBreakpoints::ClearConditionAbsolute(const uint64_t address)
-{
-	const ModuleNameAndOffset info = m_state->GetModules()->AbsoluteAddressToRelative(address);
-	ClearConditionOffset(info);
-}
-
-
-void DebuggerBreakpoints::ClearConditionOffset(const ModuleNameAndOffset& address)
-{
-	if (const auto key = FindConditionKey(address))
-	{
-		m_conditions.erase(*key);
-		SerializeMetadata();
-	}
-}
-
-
 void DebuggerBreakpoints::SerializeMetadata()
 {
 	// TODO: who should free these Metadata objects?

core/debuggerstate.h

@@ -111,8 +111,6 @@ namespace BinaryNinjaDebugger {
 		std::string GetConditionOffset(const ModuleNameAndOffset& address);
 		bool HasConditionAbsolute(uint64_t address);
 		bool HasConditionOffset(const ModuleNameAndOffset& address);
-		void ClearConditionAbsolute(uint64_t address);
-		void ClearConditionOffset(const ModuleNameAndOffset& address);
 
 	private:
 		// Helper to find the actual key in m_conditions matching the given address,

core/ffi.cpp

@@ -991,7 +991,7 @@ char* BNDebuggerGetBreakpointConditionRelative(BNDebuggerController* controller,
 
 uint64_t BNDebuggerRelativeAddressToAbsolute(BNDebuggerController* controller, const char* module, uint64_t offset)
 {
-	const DebuggerState* state = controller->object->GetState();
+	DebuggerState* state = controller->object->GetState();
 	if (!state)
 		return 0;