more robust test; nits

Author: ndrewh

compiler-rt/lib/sanitizer_common/sanitizer_procmaps_mac.cpp

@@ -257,18 +257,18 @@ static bool NextSegmentLoad(MemoryMappedSegment *segment,
   if (((const load_command *)lc)->cmd == kLCSegment) {
     const SegmentCommand* sc = (const SegmentCommand *)lc;
     if (strncmp(sc->segname, "__LINKEDIT", sizeof("__LINKEDIT")) == 0) {
-      // The LINKEDIT sections alias, so we ignore these sections to
-      // ensure our mappings are disjoint.
+      // The LINKEDIT sections are for internal linker use, and may alias
+      // with the LINKEDIT section for other modules. (If we included them,
+      // our memory map would contain overlappping sections.)
       return false;
     }
 
     uptr base_virt_addr;
-    if (layout_data->current_image == kDyldImageIdx) {
+    if (layout_data->current_image == kDyldImageIdx)
       base_virt_addr = (uptr)_dyld_get_image_slide(get_dyld_hdr());
-    } else {
+    else
       base_virt_addr =
           (uptr)_dyld_get_image_vmaddr_slide(layout_data->current_image);
-    }
 
     segment->start = sc->vmaddr + base_virt_addr;
     segment->end = segment->start + sc->vmsize;

compiler-rt/test/asan/TestCases/Darwin/asan-verify-module-map.cpp

@@ -1,20 +1,25 @@
 // This test simply checks that the "Invalid dyld module map" warning is not printed
 // in the output of a backtrace.
 
-// RUN: %clangxx_asan -O0 -g %s -o %t.executable
-// RUN: %env_asan_opts="print_module_map=2" not %run %t.executable 2>&1 | FileCheck %s
+// RUN: %clangxx_asan -DSHARED_LIB -g %s -dynamiclib -o %t.dylib
+// RUN: %clangxx_asan -O0 -g %s %t.dylib -o %t.executable
+// RUN: %env_asan_opts="print_module_map=2" not %run %t.executable 2>&1 | FileCheck %s -DDYLIB=%t.dylib
 
 // CHECK-NOT: WARN: Invalid dyld module map
+// CHECK-DAG: 0x{{.*}}-0x{{.*}} [[DYLIB]]
+// CHECK-DAG: 0x{{.*}}-0x{{.*}} {{.*}}libsystem
 
-#include <cstdlib>
-
+#ifdef SHARED_LIB
 extern "C" void foo(int *a) { *a = 5; }
+#else
+#  include <cstdlib>
+
+extern "C" void foo(int *a);
 
 int main() {
   int *a = (int *)malloc(sizeof(int));
-  if (!a)
-    return 0;
   free(a);
   foo(a);
   return 0;
-}
+}
+#endif