commit 7bd30423d3cd8ed7e0dbd33a9b2500b4ba0a78b5
author Vitaly Buka <vitalybuka@google.com> Wed Oct 15 18:20:25 2025 -0700
committer Vitaly Buka <vitalybuka@google.com> Wed Oct 15 18:20:25 2025 -0700
tree d01f7ee89ccf99b3756126db9565b74fba085d81
parent 8d1454be414449bce0869d521313a355cd062d45

[𝘀𝗽𝗿] changes to main this commit is based on

Created using spr 1.3.6

[skip ci]

compiler-rt/lib/asan/asan_fake_stack.cpp

diff --git a/compiler-rt/lib/asan/asan_fake_stack.cpp b/compiler-rt/lib/asan/asan_fake_stack.cpp
index 5034ea2..d243b57 100644
--- a/compiler-rt/lib/asan/asan_fake_stack.cpp
+++ b/compiler-rt/lib/asan/asan_fake_stack.cpp
@@ -231,17 +231,25 @@
 }
 
 static FakeStack* GetFakeStackFast() {
-  if (FakeStack* fs = GetTLSFakeStack())
+  FakeStack* fs = GetTLSFakeStack();
+  if (LIKELY(fs))
     return fs;
   if (!__asan_option_detect_stack_use_after_return)
     return nullptr;
-  return GetFakeStack();
+  fs = GetFakeStack();
+  if (LIKELY(fs))
+    SetTLSFakeStack(fs);
+  return fs;
 }
 
 static FakeStack* GetFakeStackFastAlways() {
-  if (FakeStack* fs = GetTLSFakeStack())
+  FakeStack* fs = GetTLSFakeStack();
+  if (LIKELY(fs))
     return fs;
-  return GetFakeStack();
+  fs = GetFakeStack();
+  if (LIKELY(fs))
+    SetTLSFakeStack(fs);
+  return fs;
 }
 
 static ALWAYS_INLINE uptr OnMalloc(uptr class_id, uptr size) {

compiler-rt/lib/asan/asan_fake_stack.h

diff --git a/compiler-rt/lib/asan/asan_fake_stack.h b/compiler-rt/lib/asan/asan_fake_stack.h
index ec772c3..7dedb29 100644
--- a/compiler-rt/lib/asan/asan_fake_stack.h
+++ b/compiler-rt/lib/asan/asan_fake_stack.h
@@ -195,7 +195,7 @@
   void *true_start;
 };
 
-void SetTLSFakeStack(FakeStack *fs);
+void SetTLSFakeStack(FakeStack* fs);
 
 }  // namespace __asan