Skip to content

Fix address sanitizer build #3159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexK-BD wants to merge 2 commits into
base: main
Choose a base branch
from
+4 −2
Open

Fix address sanitizer build #3159

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e2f143
fix address sanitizer on gcc and don't require special macro
AlexK-BD Mar 9, 2026
da188ba
undo the new macro definition
AlexK-BD Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions include/mujoco/mjsan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,16 @@ extern "C" {
#endif

void mj__markStack(mjData*) __attribute__((noinline));
static inline void mj_markStack(mjData* d) __attribute__((always_inline)) {
static void mj_markStack(mjData* d) __attribute__((always_inline));
static inline void mj_markStack(mjData* d) {
asm volatile("" ::: "memory");
mj__markStack(d);
asm volatile("" ::: "memory");
}

void mj__freeStack(mjData*) __attribute__((noinline));
static inline void mj_freeStack(mjData* d) __attribute__((always_inline)) {
static void mj_freeStack(mjData* d) __attribute__((always_inline));
static inline void mj_freeStack(mjData* d) {
asm volatile("" ::: "memory");
mj__freeStack(d);
asm volatile("" ::: "memory");
Expand Down