Minor improvements

Author: kleisauke

src/library_noderawfs.js

@@ -52,7 +52,7 @@ addToLibrary({
     // generic function for all node creation
     cwd() { return process.cwd(); },
     chdir() { process.chdir.apply(void 0, arguments); },
-    mknod(path, mode) {
+    mknod(path, mode/*, dev */) {
       if (FS.isDir(path)) {
         fs.mkdirSync(path, mode);
       } else {

src/library_syscall.js

@@ -834,7 +834,7 @@ var SyscallsLibrary = {
   __syscall_fstatfs64__deps: ['__syscall_statfs64'],
   __syscall_fstatfs64: (fd, size, buf) => {
     var stream = SYSCALLS.getStreamFromFD(fd);
-    return ___syscall_statfs64(0, size, buf);
+    return ___syscall_statfs64(stream.path, size, buf);
   },
   __syscall_fadvise64__nothrow: true,
   __syscall_fadvise64__proxy: 'none',

src/library_wasi.js

@@ -508,13 +508,13 @@ var WasiLibrary = {
       var type = stream.tty ? {{{ cDefs.__WASI_FILETYPE_CHARACTER_DEVICE }}} :
                  FS.isDir(stream.mode) ? {{{ cDefs.__WASI_FILETYPE_DIRECTORY }}} :
                  FS.isLink(stream.mode) ? {{{ cDefs.__WASI_FILETYPE_SYMBOLIC_LINK }}} :
-                 {{{ cDefs.__WASI_FILETYPE_REGULAR_FILE }}};
+                 FS.isFile(stream.mode) ? {{{ cDefs.__WASI_FILETYPE_REGULAR_FILE }}} :
+                 -1;
+      if (type === -1) return -{{{ cDefs.EBADF }}};
 #else
       // Hack to support printf in SYSCALLS_REQUIRE_FILESYSTEM=0. We support at
       // least stdin, stdout, stderr in a simple way.
-#if ASSERTIONS
-      assert(fd == 0 || fd == 1 || fd == 2);
-#endif
+      if (fd < 0 || fd > 2) return -{{{ cDefs.EBADF }}};
       var type = {{{ cDefs.__WASI_FILETYPE_CHARACTER_DEVICE }}};
       if (fd == 0) {
         rightsBase = {{{ cDefs.__WASI_RIGHTS_FD_READ }}};

system/lib/compiler-rt/lib/asan/asan_interceptors.h

@@ -34,10 +34,10 @@ void InitializePlatformInterceptors();
 
 }  // namespace __asan
 
-// There is no general interception at all on Fuchsia.
+// There is no general interception at all on Fuchsia and Emscripten.
 // Only the functions in asan_interceptors_memintrinsics.h are
 // really defined to replace libc functions.
-#if !SANITIZER_FUCHSIA
+#if !SANITIZER_FUCHSIA && !SANITIZER_EMSCRIPTEN
 
 // Use macro to describe if specific function should be
 // intercepted on a given platform.
@@ -170,6 +170,6 @@ DECLARE_REAL(char*, strstr, const char *s1, const char *s2)
   (void) ctx;
 #define COMMON_INTERCEPT_FUNCTION(name) ASAN_INTERCEPT_FUNC(name)
 
-#endif  // !SANITIZER_FUCHSIA
+#endif  // !SANITIZER_FUCHSIA && !SANITIZER_EMSCRIPTEN
 
 #endif  // ASAN_INTERCEPTORS_H

system/lib/compiler-rt/lib/lsan/lsan_common_emscripten.cpp

@@ -121,11 +121,12 @@ u32 GetCurrentThreadId();
 // Finally, we can only obtain the stack pointer for the current thread,
 // so we scan the full stack for other threads.
 static void ProcessThreadsCallback(ThreadContextBase *tctx, void *arg) {
+  tid_t os_id = tctx->os_id;
+  LOG_THREADS("Processing thread %llu\n", os_id);
   if (tctx->status != ThreadStatusRunning)
     return;
 
   Frontier *frontier = reinterpret_cast<Frontier *>(arg);
-  tid_t os_id = tctx->os_id;
 
   uptr stack_begin, stack_end, tls_begin, tls_end, cache_begin, cache_end;
   DTLS *dtls;
@@ -156,6 +157,7 @@ static void ProcessThreadsCallback(ThreadContextBase *tctx, void *arg) {
     }
 
     ScanRangeForPointers(stack_begin, stack_end, frontier, "STACK", kReachable);
+    //ForEachExtraStackRange(os_id, ForEachExtraStackRangeCb, frontier);
   }
 
   if (flags()->use_tls && tls_begin) {

system/lib/compiler-rt/lib/lsan/lsan_interceptors.cpp

@@ -561,9 +561,8 @@ INTERCEPTOR(void, _exit, int status) {
 namespace __lsan {
 
 void InitializeInterceptors() {
-  // Fuchsia doesn't use interceptors that require any setup.
-#if !SANITIZER_FUCHSIA
-#if !SANITIZER_EMSCRIPTEN
+  // Fuchsia and Emscripten doesn't use interceptors that require any setup.
+#if !SANITIZER_FUCHSIA && !SANITIZER_EMSCRIPTEN
   InitializeSignalInterceptors();
 
   INTERCEPT_FUNCTION(malloc);
@@ -596,17 +595,15 @@ void InitializeInterceptors() {
   LSAN_MAYBE_INTERCEPT_PTHREAD_ATFORK;
 
   LSAN_MAYBE_INTERCEPT_STRERROR;
-#endif  // !SANITIZER_EMSCRIPTEN
+#endif  // !SANITIZER_FUCHSIA && !SANITIZER_EMSCRIPTEN
 
-#if !SANITIZER_NETBSD && !SANITIZER_FREEBSD
+#if !SANITIZER_NETBSD && !SANITIZER_FREEBSD && !SANITIZER_FUCHSIA
   if (pthread_key_create(&g_thread_finalize_key, &thread_finalize)) {
     Report("LeakSanitizer: failed to create thread key.\n");
     Die();
   }
 #endif
-
-#endif  // !SANITIZER_FUCHSIA
 }
 
 } // namespace __lsan
-#endif // SANITIZER_EMSCRIPTEN
+#endif // SANITIZER_POSIX

system/lib/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

@@ -277,7 +277,7 @@
 #define SANITIZER_INTERCEPT_SENDMMSG SI_LINUX
 #define SANITIZER_INTERCEPT_SYSMSG SI_LINUX_NOT_ANDROID
 #define SANITIZER_INTERCEPT_GETPEERNAME SI_POSIX
-#define SANITIZER_INTERCEPT_IOCTL SI_POSIX && !SI_EMSCRIPTEN
+#define SANITIZER_INTERCEPT_IOCTL SI_POSIX_NOT_EMSCRIPTEN
 #define SANITIZER_INTERCEPT_INET_ATON SI_POSIX
 #define SANITIZER_INTERCEPT_SYSINFO SI_LINUX
 #define SANITIZER_INTERCEPT_READDIR SI_POSIX