Finalize ASAN/NetBSD

[krytarowski]

Summary

This revision contains various cleanups.

Sponsored by <The NetBSD Foundation>

[krytarowski]

ping?

[kcc]

lib/sanitizer_common/sanitizer_internal_defs.h

132

Why did you remove this comment?

[krytarowski]

lib/sanitizer_common/sanitizer_internal_defs.h

132

Prompted by @emaste and @vitalybuka in https://reviews.llvm.org/D35553#inline-317121

[kcc]

LGTM

lib/asan/scripts/asan_symbolize.py

if suffix:
     if os.access(filename, os.F_OK):
       return BreakpadSymbolizer(filename)
   return None
 
 
 def SystemSymbolizerFactory(system, addr, binary, arch):
   if system == 'Darwin':
     return DarwinSymbolizer(addr, binary, arch)
-  elif system == 'Linux' or system == 'FreeBSD' or system == 'NetBSD':
+  elif system in ['Linux', 'FreeBSD', 'NetBSD']:
     return Addr2LineSymbolizer(binary)
 
 
 class BreakpadSymbolizer(Symbolizer):
   def __init__(self, filename):
     super(BreakpadSymbolizer, self).__init__()
     self.filename = filename
     lines = file(filename).readlines()

lib/sanitizer_common/sanitizer_internal_defs.h

 typedef void* fd_t;
 typedef unsigned error_t;
 #else
 typedef int fd_t;
 typedef int error_t;
 #endif
 typedef int pid_t;
 
-// WARNING: OFF_T may be different from OS type off_t, depending on the value of
-// _FILE_OFFSET_BITS. This definition of OFF_T matches the ABI of system calls
-// like pread and mmap, as opposed to pread64 and mmap64.
-// FreeBSD, NetBSD, Mac and Linux/x86-64 are special.
 #if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_MAC || \
     (SANITIZER_LINUX && defined(__x86_64__))
 typedef u64 OFF_T;
 #else
 typedef uptr OFF_T;
 #endif
 typedef u64  OFF64_T;
 

test/asan/TestCases/alloca_constant_size.cc

 // Regression test for https://github.com/google/sanitizers/issues/691
 
 // RUN: %clangxx_asan -O0 %s -o %t -fstack-protector
 // RUN: %run %t 1 2>&1 | FileCheck %s
 // RUN: %run %t 2 2>&1 | FileCheck %s
 
 #include <stdio.h>
 #include <string.h>
 
 // MSVC provides _alloca instead of alloca.
 #if defined(_MSC_VER) && !defined(alloca)
 # define alloca _alloca
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
 #include <stdlib.h>
 #else
 #include <alloca.h>
 #endif
 
 
 void f1_alloca() {
   char *dynamic_buffer = (char *)alloca(200);

test/asan/TestCases/atexit_stats.cc

 // Make sure we report atexit stats.
 // RUN: %clangxx_asan -O3 %s -o %t
 // RUN: %env_asan_opts=atexit=1:print_stats=1 %run %t 2>&1 | FileCheck %s
 //
 // No atexit output in older versions of Android due to
 // https://code.google.com/p/address-sanitizer/issues/detail?id=263
 // UNSUPPORTED: android
 
 #include <stdlib.h>
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
 #include <malloc.h>
 #endif
 int *p1 = (int*)malloc(900);
 int *p2 = (int*)malloc(90000);
 int *p3 = (int*)malloc(9000000);
 int main() { }
 
 // CHECK: AddressSanitizer exit stats:

test/asan/TestCases/non-executable-pc.cpp

 // RUN: %clangxx_asan %s -o %t
 // RUN: not %run %t 0 2>&1 | FileCheck %s
 // RUN: not %run %t n 2>&1 | FileCheck %s -check-prefix=CHECK -check-prefix=NON_EXEC
 
-// Only Linux and FreeBSD list every memory region in MemoryMappingLayout, for now.
-// REQUIRES: linux || freebsd
+// Not every OS lists every memory region in MemoryMappingLayout.
+// REQUIRES: linux || freebsd || netbsd
 
 #include <assert.h>
 
 typedef void void_f();
 int main(int argc, char **argv) {
   char *array = new char[42];
   void_f *func;
   assert(argc > 1);

test/asan/TestCases/verbose-log-path_test.cc

 // RUN: %clangxx_asan %s -o %T/verbose-log-path_test-binary
 
 // The glob below requires bash.
 // REQUIRES: shell
 
 // Good log_path.
 // RUN: rm -f %T/asan.log.*
 // RUN: %env_asan_opts=log_path=%T/asan.log:log_exe_name=1 not %run %T/verbose-log-path_test-binary 2> %t.out
 // RUN: FileCheck %s --check-prefix=CHECK-ERROR < %T/asan.log.verbose-log-path_test-binary.*
 
-// FIXME: only FreeBSD and Linux have verbose log paths now.
+// FIXME: only FreeBSD, NetBSD and Linux have verbose log paths now.
 // XFAIL: win32,android
 // UNSUPPORTED: ios
 
 #include <stdlib.h>
 #include <string.h>
 int main(int argc, char **argv) {
   if (argc > 2) return 0;
   char *x = (char*)malloc(10);
   memset(x, 0, 10);
   int res = x[argc * 10];  // BOOOM
   free(x);
   return res;
 }
 // CHECK-ERROR: ERROR: AddressSanitizer

test/sanitizer_common/CMakeLists.txt

 set(SANITIZER_COMMON_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(SANITIZER_COMMON_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
 set(SANITIZER_COMMON_TESTSUITES)
 
 set(SUPPORTED_TOOLS)
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin|Linux|FreeBSD" AND NOT ANDROID)
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD" AND NOT ANDROID)
   list(APPEND SUPPORTED_TOOLS asan)
 endif()
 if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT ANDROID)
   list(APPEND SUPPORTED_TOOLS tsan)
   list(APPEND SUPPORTED_TOOLS msan)
   list(APPEND SUPPORTED_TOOLS lsan)
 endif()