Wait for binaryen side [ci skip] #9039 (comment)

Author: kripken

tests/stack_overflow.cpp

@@ -9,25 +9,30 @@
 
 void __attribute__((noinline)) InteropString(char *staticBuffer)
 {
-	char *string = (char*)EM_ASM_INT({
-		var str = "hello, this is a string! ";
-		for(var i = 0; i < 15; ++i)
-			str = str + str;
-		var stringOnTheStack = allocate(intArrayFromString(str), 'i8', ALLOC_STACK);
-		return stringOnTheStack;
-	});
-
-	int stringLength = strlen(string);
-	printf("Got string: %s\n", string);
-	printf("Received a string of length %d.\n", stringLength);
-	strcpy(staticBuffer, string);
+  char *string = (char*)EM_ASM_INT({
+    var str = "hello, this is a string! ";
+#if ONE_BIG_STRING
+    // double it until it is bigger than the stack
+    for (var i = 0; i < 15; ++i) {
+      str = str + str;
+    }
+    allocate(intArrayFromString(str), "i8", ALLOC_STACK);
+#else
+    // allocate as many times as we need to overflow
+    for (var i = 0; i < 1024 * 1024; i++) {
+      allocate(intArrayFromString(str), "i8", ALLOC_STACK);
+    }
+    abort("we should never get here!");
+#endif
+  });
 }
 
 int main()
 {
-	char staticBuffer[512288] = {}; // Make asm.js side consume a large portion of the stack, before bumping the rest with C++<->JS interop.
-	InteropString(staticBuffer);
-	int stringLength = strlen(staticBuffer);
-	printf("Got string: %s\n", staticBuffer);
-	printf("Received a string of length %d.\n", stringLength);
+  // Make C side consume a large portion of the stack, before bumping the rest with C++<->JS interop.
+  char staticBuffer[512288] = {};
+  InteropString(staticBuffer);
+  int stringLength = strlen(staticBuffer);
+  printf("Got string: %s\n", staticBuffer);
+  printf("Received a string of length %d.\n", stringLength);
 }

tests/test_core.py

@@ -7811,15 +7811,13 @@ def test_fs_dict_none(self):
     self.do_run('int main() { return 0; }', expected)
 
   @sync
-  @no_wasm_backend("https://github.com/emscripten-core/emscripten/issues/9039")
   def test_stack_overflow_check(self):
-    args = self.emcc_args + ['-s', 'TOTAL_STACK=1048576']
-
-    self.emcc_args = args + ['-s', 'STACK_OVERFLOW_CHECK=2', '-s', 'ASSERTIONS=0']
-    self.do_runf(path_from_root('tests', 'stack_overflow.cpp'), 'Stack overflow! Attempted to allocate', assert_returncode=NON_ZERO)
+    self.set_setting('TOTAL_STACK', 1048576)
+    self.set_setting('STACK_OVERFLOW_CHECK', 2)
+    self.do_runf(path_from_root('tests', 'stack_overflow.cpp'), 'stack overflow', assert_returncode=NON_ZERO)
 
-    self.emcc_args = args + ['-s', 'ASSERTIONS=1']
-    self.do_runf(path_from_root('tests', 'stack_overflow.cpp'), 'Stack overflow! Attempted to allocate', assert_returncode=NON_ZERO)
+    self.emcc_args += ['-DONE_BIG_STRING']
+    self.do_runf(path_from_root('tests', 'stack_overflow.cpp'), 'stack overflow', assert_returncode=NON_ZERO)
 
   @node_pthreads
   def test_binaryen_2170_emscripten_atomic_cas_u8(self):