Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[upstream_utils] Upgrade Sleipnir to avoid pool allocator crash on Windows (#6821)

Browse Source
This commit is contained in:
Tyler Veness
2024-07-10 06:39:30 -07:00
committed by GitHub
parent c62863cf74
commit 27a2e02b52
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
upstream_utils/update_sleipnir.py
View File

@@ -15,8 +15,8 @@ from upstream_utils import (
def main():
upstream_root = clone_repo(
"https://github.com/SleipnirGroup/Sleipnir",
# main on 2024-07-05
"b90f89d343379dd8dc88f22e0462eb7b59006b2c",
# main on 2024-07-09
"b6ffa2d4fdb99cab1bf79491f715a6a9a86633b5",
shallow=False,
)
wpilib_root = get_repo_root()

24
wpimath/src/main/native/thirdparty/sleipnir/include/sleipnir/autodiff/Expression.hpp vendored
View File

@@ -20,6 +20,14 @@
namespace sleipnir::detail {
// The global pool allocator uses a thread-local static pool resource, which
// isn't guaranteed to be initialized properly across DLL boundaries on Windows
#ifdef _WIN32
inline constexpr bool kUsePoolAllocator = false;
#else
inline constexpr bool kUsePoolAllocator = true;
#endif
struct SLEIPNIR_DLLEXPORT Expression;
inline void IntrusiveSharedPtrIncRefCount(Expression* expr);
@@ -38,8 +46,12 @@ using ExpressionPtr = IntrusiveSharedPtr<Expression>;
*/
template <typename... Args>
static ExpressionPtr MakeExpressionPtr(Args&&... args) {
return AllocateIntrusiveShared<Expression>(GlobalPoolAllocator<Expression>(),
std::forward<Args>(args)...);
if constexpr (kUsePoolAllocator) {
return AllocateIntrusiveShared<Expression>(
GlobalPoolAllocator<Expression>(), std::forward<Args>(args)...);
} else {
return MakeIntrusiveShared<Expression>(std::forward<Args>(args)...);
}
}
/**
@@ -437,9 +449,11 @@ inline void IntrusiveSharedPtrDecRefCount(Expression* expr) {
// Not calling the destructor here is safe because it only decrements
// refcounts, which was already done above.
auto alloc = GlobalPoolAllocator<Expression>();
std::allocator_traits<decltype(alloc)>::deallocate(alloc, elem,
sizeof(Expression));
if constexpr (kUsePoolAllocator) {
auto alloc = GlobalPoolAllocator<Expression>();
std::allocator_traits<decltype(alloc)>::deallocate(alloc, elem,
sizeof(Expression));
}
}
}
}