Try to fix sanitizer tests

Author: kleisauke

system/lib/compiler-rt/lib/sanitizer_common/sanitizer_emscripten.cpp

@@ -14,17 +14,25 @@
 //===----------------------------------------------------------------------===//
 
 #include "sanitizer_platform.h"
+#include "sanitizer_platform_limits_posix.h"
 #include "sanitizer_common.h"
 #include "sanitizer_stoptheworld.h"
 
+#include <fcntl.h>
 #include <signal.h>
 #include <time.h>
+#include <unistd.h>
+#include <math.h>
 
 #if SANITIZER_EMSCRIPTEN
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include <emscripten.h>
 #include <emscripten/stack.h>
-#include <sys/types.h>
+#include <wasi/api.h>
+#include <wasi/wasi-helpers.h>
 
 #include "emscripten_internal.h"
 
@@ -127,6 +135,70 @@ u64 MonotonicNanoTime() {
   return (u64)ts.tv_sec * (1000ULL * 1000 * 1000) + ts.tv_nsec;
 }
 
+uptr internal_close(fd_t fd) {
+  return __wasi_fd_close(fd);
+}
+
+uptr internal_open(const char* filename, int flags) {
+  return open(filename, flags);
+}
+
+uptr internal_open(const char* filename, int flags, u32 mode) {
+  return open(filename, flags, mode);
+}
+
+uptr internal_read(fd_t fd, void* buf, uptr count) {
+  __wasi_iovec_t iov = { (uint8_t*)buf, count };
+  size_t num;
+  if (__wasi_syscall_ret(__wasi_fd_read(fd, &iov, 1, &num))) {
+    return -1;
+  }
+  return num;
+}
+
+uptr internal_write(fd_t fd, const void* buf, uptr count) {
+  __wasi_ciovec_t iov = { (const uint8_t*)buf, count };
+  size_t num;
+  if (__wasi_syscall_ret(__wasi_fd_write(fd, &iov, 1, &num))) {
+    return -1;
+  }
+  return num;
+}
+
+uptr internal_stat(const char* path, void* buf) {
+  return stat(path, (struct stat *)buf);
+}
+
+uptr internal_dup(int oldfd) {
+  return dup(oldfd);
+}
+
+uptr internal_getpid() {
+  return 42;
+}
+
+uptr internal_sched_yield() {
+  return 0;
+}
+
+void internal_usleep(u64 useconds) {
+  usleep(useconds);
+}
+
+void internal__exit(int exitcode) {
+  __wasi_proc_exit(exitcode);
+}
+
+tid_t GetTid() {
+  return gettid();
+}
+
+extern "C" int __clock_gettime(__sanitizer_clockid_t clk_id, void* tp);
+
+uptr internal_clock_gettime(__sanitizer_clockid_t clk_id, void* tp) {
+  return __clock_gettime(clk_id, tp);
+}
+
 } // namespace __sanitizer
 
 #endif

system/lib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp

@@ -109,10 +109,8 @@ extern struct ps_strings *__ps_strings;
 #endif
 
 #if SANITIZER_EMSCRIPTEN
-#include <emscripten/threading.h>
-#include <math.h>
-#include <wasi/api.h>
-#include <wasi/wasi-helpers.h>
+#include <math.h>  // For INFINITY
+#include <emscripten/threading.h>  // For emscripten_futex_wait
 #endif
 
 extern char **environ;
@@ -271,19 +269,10 @@ uptr internal_read(fd_t fd, void *buf, uptr count) {
 }
 
 uptr internal_write(fd_t fd, const void *buf, uptr count) {
-#if SANITIZER_EMSCRIPTEN
-  __wasi_ciovec_t iov = { (const uint8_t *)buf, count };
-  size_t num;
-  if (__wasi_syscall_ret(__wasi_fd_write(fd, &iov, 1, &num))) {
-    return -1;
-  }
-  return num;
-#else
   sptr res;
   HANDLE_EINTR(res,
                (sptr)internal_syscall(SYSCALL(write), fd, (uptr)buf, count));
   return res;
-#endif
 }
 
 uptr internal_ftruncate(fd_t fd, uptr size) {
@@ -536,18 +525,16 @@ uptr internal_execve(const char *filename, char *const argv[],
 }
 #endif  // !SANITIZER_SOLARIS && !SANITIZER_NETBSD && !SANITIZER_EMSCRIPTEN
 
-#if !SANITIZER_NETBSD
+#if !SANITIZER_NETBSD && !SANITIZER_EMSCRIPTEN
 void internal__exit(int exitcode) {
-#if SANITIZER_EMSCRIPTEN
-  __wasi_proc_exit(exitcode);
-#elif SANITIZER_FREEBSD || SANITIZER_SOLARIS
+#if SANITIZER_FREEBSD || SANITIZER_SOLARIS
   internal_syscall(SYSCALL(exit), exitcode);
 #else
   internal_syscall(SYSCALL(exit_group), exitcode);
 #endif
   Die();  // Unreachable.
 }
-#endif  // !SANITIZER_NETBSD
+#endif  // !SANITIZER_NETBSD && !SANITIZER_EMSCRIPTEN
 
 // ----------------- sanitizer_common.h
 bool FileExists(const char *filename) {
@@ -567,16 +554,14 @@ bool DirExists(const char *path) {
   return S_ISDIR(st.st_mode);
 }
 
-#  if !SANITIZER_NETBSD
+#  if !SANITIZER_NETBSD && !SANITIZER_EMSCRIPTEN
 tid_t GetTid() {
 #if SANITIZER_FREEBSD
   long Tid;
   thr_self(&Tid);
   return Tid;
 #elif SANITIZER_SOLARIS
   return thr_self();
-#elif SANITIZER_EMSCRIPTEN
-  return gettid();
 #else
   return internal_syscall(SYSCALL(gettid));
 #endif
@@ -615,16 +600,6 @@ u64 NanoTime() {
 }
 #endif
 
-#if SANITIZER_EMSCRIPTEN
-extern "C" {
-int __clock_gettime(__sanitizer_clockid_t clk_id, void *tp);
-}
-
-uptr internal_clock_gettime(__sanitizer_clockid_t clk_id, void *tp) {
-  return __clock_gettime(clk_id, tp);
-}
-#endif
-
 // Like getenv, but reads env directly from /proc (on Linux) or parses the
 // 'environ' array (on some others) and does not use libc. This function
 // should be called first inside __asan_init.