Skip to content

Commit dc0cb17

Browse files
authored
[msan] Nit: use init_origins parameter instead of __msan_get_track_origins() in InitShadowWithReExec (#86994)
This fixes a nit I had accidentally introduced in #85142 I don't think the value of __msan_get_track_origins() will change between the start and end of InitShadowWithReExec, but it's cleaner to use the parameter.
1 parent 216b5e9 commit dc0cb17

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compiler-rt/lib/msan/msan_linux.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ bool InitShadowWithReExec(bool init_origins) {
175175
// Start with dry run: check layout is ok, but don't print warnings because
176176
// warning messages will cause tests to fail (even if we successfully re-exec
177177
// after the warning).
178-
bool success = InitShadow(__msan_get_track_origins(), true);
178+
bool success = InitShadow(init_origins, true);
179179
if (!success) {
180180
# if SANITIZER_LINUX
181181
// Perhaps ASLR entropy is too high. If ASLR is enabled, re-exec without it.
@@ -197,7 +197,7 @@ bool InitShadowWithReExec(bool init_origins) {
197197

198198
// The earlier dry run didn't actually map or protect anything. Run again in
199199
// non-dry run mode.
200-
return success && InitShadow(__msan_get_track_origins(), false);
200+
return success && InitShadow(init_origins, false);
201201
}
202202

203203
static void MsanAtExit(void) {

0 commit comments

Comments
 (0)