Removing (safe) UB from tests for UBSan sake

gershnik · gershnik · commit 9b2c8c322cdf · 2026-05-19T02:15:20.000-07:00
diff --git a/test/test_delegating_traits.cpp b/test/test_delegating_traits.cpp
@@ -133,8 +133,8 @@ namespace
         {
             static const outer * real_from_delegating(const int * pinner) noexcept
             {
-                outer * dummy = nullptr;
-                size_t distance = (uintptr_t)&(dummy->_inner) - (uintptr_t)dummy;
+                outer dummy;
+                size_t distance = (uintptr_t)&(dummy._inner) - (uintptr_t)&dummy;
                 return (const outer *)((std::byte *)pinner - distance);
                 //return offsetof(outer, _inner);
             }
@@ -169,8 +169,8 @@ namespace
         {
             static const weak_outer * real_from_delegating(const int * pinner) noexcept
             {
-                weak_outer * dummy = nullptr;
-                size_t distance = (uintptr_t)&(dummy->_inner) - (uintptr_t)dummy;
+                weak_outer dummy;
+                size_t distance = (uintptr_t)&(dummy._inner) - (uintptr_t)&dummy;
                 return (const weak_outer *)((std::byte *)pinner - distance);
                 //return offsetof(outer, _inner);
             }

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,8 @@ namespace`
`133`	`133`	`{`
`134`	`134`	`static const outer * real_from_delegating(const int * pinner) noexcept`
`135`	`135`	`{`
`136`		`- outer * dummy = nullptr;`
`137`		`- size_t distance = (uintptr_t)&(dummy->_inner) - (uintptr_t)dummy;`
	`136`	`+ outer dummy;`
	`137`	`+ size_t distance = (uintptr_t)&(dummy._inner) - (uintptr_t)&dummy;`
`138`	`138`	`return (const outer )((std::byte )pinner - distance);`
`139`	`139`	`//return offsetof(outer, _inner);`
`140`	`140`	`}`
`@@ -169,8 +169,8 @@ namespace`
`169`	`169`	`{`
`170`	`170`	`static const weak_outer * real_from_delegating(const int * pinner) noexcept`
`171`	`171`	`{`
`172`		`- weak_outer * dummy = nullptr;`
`173`		`- size_t distance = (uintptr_t)&(dummy->_inner) - (uintptr_t)dummy;`
	`172`	`+ weak_outer dummy;`
	`173`	`+ size_t distance = (uintptr_t)&(dummy._inner) - (uintptr_t)&dummy;`
`174`	`174`	`return (const weak_outer )((std::byte )pinner - distance);`
`175`	`175`	`//return offsetof(outer, _inner);`
`176`	`176`	`}`