Skip to content

Commit 3ba93f0

Browse files
sbc100sbc100
authored
Enable longjmp + pthreads + dylink (emscripten-core#15356)
The underlying bug that caused this configuration not to work (lack of TLS import/export) was fixed in emscripten-core#14971. Fixes: emscripten-core#14461
1 parent c273f25 commit 3ba93f0

6 files changed

Lines changed: 55 additions & 8 deletions

File tree

‎emcc.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,10 +2015,6 @@ def include_and_export(name):
20152015
elif settings.LINKABLE:
20162016
diagnostics.warning('experimental', '-s LINKABLE + pthreads is experimental')
20172017

2018-
default_setting('SUPPORT_LONGJMP', 0)
2019-
if settings.SUPPORT_LONGJMP:
2020-
exit_with_error('SUPPORT_LONGJMP is not compatible with pthreads + dynamic linking')
2021-
20222018
if settings.PROXY_TO_WORKER:
20232019
exit_with_error('--proxy-to-worker is not supported with -s USE_PTHREADS>0! Use the option -s PROXY_TO_PTHREAD=1 if you want to run the main thread of a multithreaded application in a web worker.')
20242020
elif settings.PROXY_TO_PTHREAD:

‎tests/core/pthread/test_pthread_dylink_longjmp.c‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#include <assert.h>
2+
#include <setjmp.h>
3+
#include <stdbool.h>
4+
#include <stdio.h>
5+
#include <pthread.h>
6+
7+
void longjmp_side();
8+
9+
static void* thread_main(void *arg) {
10+
jmp_buf buf;
11+
int jmpval = setjmp(buf);
12+
if (!jmpval) {
13+
printf("setjmp done\n");
14+
longjmp_side(&buf);
15+
// should never get here
16+
assert(false);
17+
} else if (jmpval == 42) {
18+
printf("longjmp done\n");
19+
} else {
20+
assert(false);
21+
}
22+
23+
return NULL;
24+
}
25+
26+
int main() {
27+
pthread_t t;
28+
int rc;
29+
30+
rc = pthread_create(&t, NULL, thread_main, NULL);
31+
assert(!rc);
32+
rc = pthread_join(t, NULL);
33+
assert(!rc);
34+
35+
printf("Done");
36+
return 0;
37+
}

‎tests/core/pthread/test_pthread_dylink_longjmp.out‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
setjmp done
2+
longjmp done
3+
Done

‎tests/core/pthread/test_pthread_dylink_longjmp_side.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#include <setjmp.h>
2+
3+
void longjmp_side(jmp_buf* buf) {
4+
longjmp(*buf, 42); // jumps back to where setjmp was called
5+
}

‎tests/test_core.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8549,6 +8549,16 @@ def test_pthread_dylink_tls(self):
85498549
main = test_file('core/pthread/test_pthread_dylink_tls.c')
85508550
self.dylink_testf(main, need_reverse=False)
85518551

8552+
@needs_dylink
8553+
@node_pthreads
8554+
def test_pthread_dylink_longjmp(self):
8555+
self.emcc_args.append('-Wno-experimental')
8556+
self.set_setting('EXIT_RUNTIME')
8557+
self.set_setting('USE_PTHREADS')
8558+
self.set_setting('PTHREAD_POOL_SIZE=1')
8559+
main = test_file('core/pthread/test_pthread_dylink_longjmp.c')
8560+
self.dylink_testf(main, need_reverse=False)
8561+
85528562
@needs_dylink
85538563
@node_pthreads
85548564
def test_Module_dynamicLibraries_pthreads(self):

‎tests/test_other.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,10 +1676,6 @@ def test_dylink_pthread_warning(self):
16761676
err = self.expect_fail([EMCC, '-Werror', '-sMAIN_MODULE', '-sUSE_PTHREADS', test_file('hello_world.c')])
16771677
self.assertContained('error: -s MAIN_MODULE + pthreads is experimental', err)
16781678

1679-
def test_dylink_pthread_longjmp(self):
1680-
err = self.expect_fail([EMCC, '-sMAIN_MODULE', '-sUSE_PTHREADS', '-sSUPPORT_LONGJMP', test_file('hello_world.c')])
1681-
self.assertContained('SUPPORT_LONGJMP is not compatible with pthreads + dynamic linking', err)
1682-
16831679
def test_dylink_no_autoload(self):
16841680
create_file('main.c', r'''
16851681
#include <stdio.h>

0 commit comments

Comments
 (0)