Fix ASAN thread race with TLS dynamic initialization of variable_registry#1107
Merged
Fix ASAN thread race with TLS dynamic initialization of variable_registry#1107
Conversation
📝 WalkthroughWalkthroughRefactors the global thread-local Changes
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Contributor
Author
|
@coderabbitai review |
✅ Actions performedReview triggered.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
When running under AddressSanitizer (ASan), extra threads are spawned before the CRT debug locks are fully initialized. The
thread_local VariableRegistry variable_registryglobal variable triggered TLS dynamic-init callbacks that could race with CRT startup on these early threads, leading to heap-buffer-overflow or other undefined behavior.Solution
Replace the file-scope
thread_localvariable with a function-localthread_localinside a getter function (get_variable_registry()). This defers construction until the first actual use rather than running during TLS dynamic initialization, avoiding the race condition with early-spawned threads.A backward-compatible
#define variable_registrymacro alias is provided so all existing call sites continue to work without modification.Changes
src/crab/var_registry.hpp: Replaceextern thread_local VariableRegistry variable_registrywithVariableRegistry& get_variable_registry()declaration and a backward-compatible macro alias.src/crab/var_registry.cpp: Move thethread_localinstance inside a function-local scope inget_variable_registry().Testing
All 1533 tests pass (1295 passed, 1 skipped, 237 failed as expected — no change from baseline).