From 1f4a7c5101c5be52a2efdc4648639fbfc46fad29 Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Sun, 29 Aug 2021 11:06:19 +0100 Subject: [PATCH] logging: don't call the returned function twice (one for log, one for return) Z3_simplify() does RETURN_Z3(simplify(...)), hence the function was being called twice it turns out simplify is not idempotent, so calling it twice can result in different results thus breaking the log. --- scripts/update_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_api.py b/scripts/update_api.py index 509524159..27766b451 100755 --- a/scripts/update_api.py +++ b/scripts/update_api.py @@ -1725,7 +1725,7 @@ def write_log_h_preamble(log_h): log_h.write('extern std::atomic g_z3_log_enabled;\n') log_h.write('class z3_log_ctx { bool m_prev; public: z3_log_ctx() { m_prev = g_z3_log && g_z3_log_enabled.exchange(false); } ~z3_log_ctx() { if (g_z3_log) g_z3_log_enabled = m_prev; } bool enabled() const { return m_prev; } };\n') log_h.write('inline void SetR(void * obj) { *g_z3_log << "= " << obj << "\\n"; }\ninline void SetO(void * obj, unsigned pos) { *g_z3_log << "* " << obj << " " << pos << "\\n"; } \ninline void SetAO(void * obj, unsigned pos, unsigned idx) { *g_z3_log << "@ " << obj << " " << pos << " " << idx << "\\n"; }\n') - log_h.write('#define RETURN_Z3(Z3RES) if (_LOG_CTX.enabled()) { SetR(Z3RES); } return Z3RES\n') + log_h.write('#define RETURN_Z3(Z3RES) do { auto tmp_ret = Z3RES; if (_LOG_CTX.enabled()) { SetR(tmp_ret); } return tmp_ret; } while (0)\n') log_h.write('void _Z3_append_log(char const * msg);\n')