Florian's feedback

Author: thurstond

compiler-rt/lib/asan/asan_linux.cpp

@@ -114,8 +114,12 @@ void ReExecWithoutASLR() {
   // this function as a last resort (when the memory mapping is incompatible
   // and ASan would fail anyway).
   int old_personality = personality(0xffffffff);
-  bool aslr_on =
-      (old_personality != -1) && ((old_personality & ADDR_NO_RANDOMIZE) == 0);
+  if (old_personality == -1) {
+    VReport(1, "WARNING: unable to run personality check.\n");
+    return;
+  }
+
+  bool aslr_on = ((old_personality & ADDR_NO_RANDOMIZE) == 0);
 
   if (aslr_on) {
     // Disable ASLR if the memory layout was incompatible.

compiler-rt/lib/asan/asan_shadow_setup.cpp

@@ -109,14 +109,12 @@ void InitializeShadowMemory() {
     ProtectGap(kShadowGap2Beg, kShadowGap2End - kShadowGap2Beg + 1);
     ProtectGap(kShadowGap3Beg, kShadowGap3End - kShadowGap3Beg + 1);
   } else {
-#  if SANITIZER_LINUX
     // The shadow mappings can shadow the entire user address space. However,
     // on 32-bit systems, the maximum ASLR entropy (currently up to 16-bits
     // == 256MB) is a significant chunk of the address space; reclaiming it by
     // disabling ASLR might allow chonky binaries to run.
     if (sizeof(uptr) == 32)
       TryReExecWithoutASLR();
-#  endif
 
     Report(
         "Shadow memory range interleaves with an existing memory mapping. "

compiler-rt/lib/asan/asan_win.cpp

@@ -43,7 +43,6 @@ uptr __asan_get_shadow_memory_dynamic_address() {
   __asan_init();
   return __asan_shadow_memory_dynamic_address;
 }
-
 }  // extern "C"
 
 // ---------------------- Windows-specific interceptors ---------------- {{{