diff --git a/compiler-rt/lib/hwasan/hwasan.cpp b/compiler-rt/lib/hwasan/hwasan.cpp --- a/compiler-rt/lib/hwasan/hwasan.cpp +++ b/compiler-rt/lib/hwasan/hwasan.cpp @@ -340,7 +340,12 @@ DisableCoreDumperIfNecessary(); InitInstrumentation(); +#if !SANITIZER_FUCHSIA + // Fuchsia's libc provides a hook (__sanitizer_module_loaded) that runs on the + // startup path which calls into __hwasan_library_loaded on all initially + // loaded modules, so explicitly registering the globals here isn't needed. InitLoadedGlobals(); +#endif // Needs to be called here because flags()->random_tags might not have been // initialized when InitInstrumentation() was called.