Skip to content

[NFC][asan] Report DynInitUnPoison #101586

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.

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

Merged

Conversation

vitalybuka
Copy link
Collaborator

No description provided.

@llvmbot
Copy link
Member

llvmbot commented Aug 1, 2024

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Vitaly Buka (vitalybuka)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/101586.diff

2 Files Affected:

  • (modified) compiler-rt/lib/asan/asan_globals.cpp (+2-1)
  • (modified) compiler-rt/test/asan/TestCases/initialization-nobug.cpp (+2)
diff --git a/compiler-rt/lib/asan/asan_globals.cpp b/compiler-rt/lib/asan/asan_globals.cpp
index 90481467d5eb8..4849650214773 100644
--- a/compiler-rt/lib/asan/asan_globals.cpp
+++ b/compiler-rt/lib/asan/asan_globals.cpp
@@ -467,7 +467,8 @@ void __asan_after_dynamic_init() {
     return;
   CHECK(AsanInited());
   Lock lock(&mu_for_globals);
-  // FIXME: Optionally report that we're unpoisoning globals from a module.
+  if (flags()->report_globals >= 3)
+    Printf("DynInitUnpoison\n");
   for (const DynInitGlobal &dyn_g : dynamic_init_globals) {
     const Global *g = &dyn_g.g;
     if (!dyn_g.initialized) {
diff --git a/compiler-rt/test/asan/TestCases/initialization-nobug.cpp b/compiler-rt/test/asan/TestCases/initialization-nobug.cpp
index 0b8fca3dee8b3..6cfef022ae57e 100644
--- a/compiler-rt/test/asan/TestCases/initialization-nobug.cpp
+++ b/compiler-rt/test/asan/TestCases/initialization-nobug.cpp
@@ -46,4 +46,6 @@ int main() { return 0; }
 
 
 // CHECK: DynInitPoison module: {{.*}}initialization-nobug.cpp
+// CHECK: DynInitUnpoison
 // CHECK: DynInitPoison module: {{.*}}initialization-nobug-extra.cpp
+// CHECK: DynInitUnpoison

@vitalybuka vitalybuka changed the base branch from users/vitalybuka/spr/main.nfcasan-report-dyninitunpoison to main August 2, 2024 20:58
@vitalybuka vitalybuka force-pushed the users/vitalybuka/spr/nfcasan-report-dyninitunpoison branch from f4c07ce to 3d1739c Compare August 2, 2024 21:03
@vitalybuka vitalybuka merged commit 72a514f into main Aug 2, 2024
4 of 5 checks passed
@vitalybuka vitalybuka deleted the users/vitalybuka/spr/nfcasan-report-dyninitunpoison branch August 2, 2024 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants