From 6fc3a8fb2a09b4c05d4c2c3d3437c04bdcad8baf Mon Sep 17 00:00:00 2001 From: oxSleep Date: Fri, 13 Feb 2026 16:59:22 +0100 Subject: [PATCH] Use when-block for sanitizer poisoning Replace @disabled attribute with when-statement to conditionally compile address sanitizer poisoning in pool elements --- core/container/pool/pool.odin | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/core/container/pool/pool.odin b/core/container/pool/pool.odin index 55ea57d55..34a9e0683 100644 --- a/core/container/pool/pool.odin +++ b/core/container/pool/pool.odin @@ -113,28 +113,30 @@ _set_next :: proc(p: ^Pool($T), elem: ^T, next: ^T) { (^^T)(uintptr(elem) + p.link_off)^ = next } -@(disabled=.Address not_in ODIN_SANITIZER_FLAGS) _poison_elem :: proc(p: ^Pool($T), elem: ^T) { - if p.link_off > 0 { - sanitizer.address_poison_rawptr(elem, int(p.link_off)) - } + when .Address in ODIN_SANITIZER_FLAGS { + if p.link_off > 0 { + sanitizer.address_poison_rawptr(elem, int(p.link_off)) + } - len := size_of(T) - p.link_off - size_of(rawptr) - if len > 0 { - ptr := rawptr(uintptr(elem) + p.link_off + size_of(rawptr)) - sanitizer.address_poison_rawptr(ptr, int(len)) + len := size_of(T) - p.link_off - size_of(rawptr) + if len > 0 { + ptr := rawptr(uintptr(elem) + p.link_off + size_of(rawptr)) + sanitizer.address_poison_rawptr(ptr, int(len)) + } } } -@(disabled=.Address not_in ODIN_SANITIZER_FLAGS) _unpoison_elem :: proc(p: ^Pool($T), elem: ^T) { - if p.link_off > 0 { - sanitizer.address_unpoison_rawptr(elem, int(p.link_off)) - } + when .Address in ODIN_SANITIZER_FLAGS { + if p.link_off > 0 { + sanitizer.address_unpoison_rawptr(elem, int(p.link_off)) + } - len := size_of(T) - p.link_off - size_of(rawptr) - if len > 0 { - ptr := rawptr(uintptr(elem) + p.link_off + size_of(rawptr)) - sanitizer.address_unpoison_rawptr(ptr, int(len)) + len := size_of(T) - p.link_off - size_of(rawptr) + if len > 0 { + ptr := rawptr(uintptr(elem) + p.link_off + size_of(rawptr)) + sanitizer.address_unpoison_rawptr(ptr, int(len)) + } } }