Fix lsan test suite

Author: sbc100

emcc.py

@@ -2134,12 +2134,18 @@ def check_memory_setting(setting):
     else:
       settings.UBSAN_RUNTIME = 2
 
-  if 'leak' in sanitize:
-    settings.USE_LSAN = 1
-    default_setting('EXIT_RUNTIME', 1)
-
-    if settings.LINKABLE:
-      exit_with_error('LSan does not support dynamic linking')
+  sanitizer_mem = 0
+  if sanitize:
+    # sanitizers do at least 9 page allocs of a single page during startup.
+    sanitizer_mem += webassembly.WASM_PAGE_SIZE * 9
+    sanitizer_mem += 2097152 * 10
+    # we also allocate at least 11 "regions". Each region is kRegionSize (2 << 20) but
+    # MmapAlignedOrDieOnFatalError adds another 2 << 20 for alignment.
+    sanitizer_mem += (1 << 21) * 11
+    # When running in the threaded mode asan needs to allocate an array of kMaxNumberOfThreads
+    # (1 << 22) pointers.  See compiler-rt/lib/asan/asan_thread.cpp.
+    if settings.USE_PTHREADS:
+      sanitizer_mem += (1 << 22) * 4
 
   if 'address' in sanitize:
     settings.USE_ASAN = 1
@@ -2213,6 +2219,18 @@ def check_memory_setting(setting):
 
     if settings.LINKABLE:
       exit_with_error('ASan does not support dynamic linking')
+  elif 'leak' in sanitize:
+    settings.USE_LSAN = 1
+    default_setting('EXIT_RUNTIME', 1)
+
+    if settings.LINKABLE:
+      exit_with_error('LSan does not support dynamic linking')
+
+  if sanitizer_mem:
+    # Increase the size of the initial memory according to how much memory
+    # we think the sanitizers will use.
+    logger.debug(f'adding {sanitizer_mem} bytes of memory for sanitizer support')
+    settings.INITIAL_MEMORY += sanitizer_mem
 
   if sanitize and settings.GENERATE_SOURCE_MAP:
     settings.LOAD_SOURCE_MAP = 1
@@ -2235,7 +2253,6 @@ def check_memory_setting(setting):
   if settings.RELOCATABLE or \
      settings.BUILD_AS_WORKER or \
      settings.USE_WEBGPU or \
-     settings.USE_PTHREADS or \
      settings.OFFSCREENCANVAS_SUPPORT or \
      settings.LEGACY_GL_EMULATION or \
      not settings.DISABLE_EXCEPTION_CATCHING or \
@@ -2251,6 +2268,11 @@ def check_memory_setting(setting):
      sanitize:
     settings.EXPORTED_FUNCTIONS += ['_malloc', '_free']
 
+  # TODO(sbc): Remove this when we land:
+  # https://github.com/emscripten-core/emscripten/pull/14912
+  if settings.USE_PTHREADS:
+    settings.EXPORTED_FUNCTIONS += ['_malloc', '_free', '_emscripten_builtin_memalign', '_emscripten_builtin_malloc', '_emscripten_builtin_free']
+
   if not settings.DISABLE_EXCEPTION_CATCHING:
     settings.EXPORTED_FUNCTIONS += [
       # For normal builds the entries in deps_info.py are enough to include

src/library.js

@@ -3774,6 +3774,8 @@ LibraryManager.library = {
   // tell the memory segments where to place themselves
   __memory_base: '{{{ GLOBAL_BASE }}}',
   __memory_base__import: true,
+  __global_base: '{{{ GLOBAL_BASE }}}',
+  __global_base__import: true,
   // the wasm backend reserves slot 0 for the NULL function pointer
   __table_base: 1,
   __table_base__import: true,

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

@@ -394,6 +394,7 @@ INTERCEPTOR(int, pthread_atfork, void (*prepare)(), void (*parent)(),
 #endif
 
 #if SANITIZER_EMSCRIPTEN
+#define __ATTRP_C11_THREAD ((void*)(uptr)-1)
 extern "C" {
   int emscripten_builtin_pthread_create(void *thread, void *attr,
                                         void *(*callback)(void *), void *arg);
@@ -452,7 +453,7 @@ INTERCEPTOR(int, pthread_create, void *th, void *attr,
   ENSURE_LSAN_INITED;
   EnsureMainThreadIDIsCorrect();
   __sanitizer_pthread_attr_t myattr;
-  if (!attr) {
+  if (!attr || attr == __ATTRP_C11_THREAD) {
     pthread_attr_init(&myattr);
     attr = &myattr;
   }

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

@@ -60,14 +60,7 @@ void ListOfModules::init() {
 
 void ListOfModules::fallbackInit() { clear(); }
 
-SANITIZER_WEAK_ATTRIBUTE int
-real_sigaction(int signum, const void *act, void *oldact);
-
 int internal_sigaction(int signum, const void *act, void *oldact) {
-#if !SANITIZER_GO
-  if (&real_sigaction)
-    return real_sigaction(signum, act, oldact);
-#endif
   return sigaction(signum, (const struct sigaction *)act,
                    (struct sigaction *)oldact);
 }

tests/core/test_dynamic_cast.cpp

@@ -16,4 +16,6 @@ struct Derived : Support {};
 int main() {
   Support* p = new Derived;
   dynamic_cast<Derived*>(p)->f();
+  delete p;
+  return 0;
 }

tests/core/test_em_asm_2.cpp

@@ -102,11 +102,11 @@ int main()
   i = EM_ASM_INT("{console.log('5. got int ' + $0); return 7.5;}", 42); printf("5. returned int %d\n", i);
 
   printf("\nEM_ASM_INT: Return an integer in a single brief statement.\n");
-  i = EM_ASM_INT(return HEAP8.length); printf("1. returned statement %d\n", i);
-  i = EM_ASM_INT("return HEAP8.length+1"); printf("2. returned statement %d\n", i);
-  i = EM_ASM_INT({"return HEAP8.length+2"}); printf("3. returned statement %d\n", i);
-  i = EM_ASM_INT({return HEAP8.length+3}); printf("4. returned statement %d\n", i);
-  i = EM_ASM_INT("return HEAP8.length+4"); printf("5. returned statement %d\n", i);
+  i = EM_ASM_INT(return 42); printf("1. returned statement %d\n", i);
+  i = EM_ASM_INT("return 42+1"); printf("2. returned statement %d\n", i);
+  i = EM_ASM_INT({"return 42+2"}); printf("3. returned statement %d\n", i);
+  i = EM_ASM_INT({return 42+3}); printf("4. returned statement %d\n", i);
+  i = EM_ASM_INT("return 42+4"); printf("5. returned statement %d\n", i);
 
   // Note that expressions do not evaluate to return values, but the "return" keyword is needed. That is, the following line would return undefined and store i <- 0.
   // i = EM_ASM_INT(HEAP8.length); printf("returned statement %d\n", i);

tests/core/test_em_asm_2.out

@@ -113,11 +113,11 @@ EM_ASM_INT: Return an integer back.
 5. returned int 7
 
 EM_ASM_INT: Return an integer in a single brief statement.
-1. returned statement 16777216
-2. returned statement 16777217
-3. returned statement 16777218
-4. returned statement 16777219
-5. returned statement 16777220
+1. returned statement 42
+2. returned statement 43
+3. returned statement 44
+4. returned statement 45
+5. returned statement 46
 
 EM_ASM_DOUBLE: Pass no parameters, return a double.
 1. returning double

tests/core/test_emptyclass.cpp

@@ -12,7 +12,6 @@ struct Randomized {
 };
 
 int main(int argc, const char *argv[]) {
-  new Randomized(55);
-
+  Randomized(55);
   return 0;
 }