Skip to content

Commit c9f75a7

Browse files
committed
Fix _memset is not defined errors in asan builds
I recently landed #15617 which inadvertently broke asan builds because, under asan, there was a real dependency on `_memset` in the `withBuiltinMalloc` wrapper. However this dependency is no longer needed since the use of `_memset` was removed from the JS library code in #14441.
1 parent ce1dfab commit c9f75a7

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ jobs:
373373
steps:
374374
- run-tests:
375375
# also add a few asan tests and a single test of EMTEST_BROWSER=node
376-
test_targets: "wasm2 asan.test_embind* asan.test_abort_on_exceptions asan.test_ubsan_full_left_shift_fsanitize_integer asan.test_pthread* asan.test_dyncall_specific_minimal_runtime asan.test_async_hello lsan.test_stdio_locking lsan.test_pthread_create browser.test_pthread_join"
376+
test_targets: "wasm2 asan.test_stat asan.test_embind* asan.test_abort_on_exceptions asan.test_ubsan_full_left_shift_fsanitize_integer asan.test_pthread* asan.test_dyncall_specific_minimal_runtime asan.test_async_hello lsan.test_stdio_locking lsan.test_pthread_create browser.test_pthread_join"
377377
test-wasm3:
378378
executor: bionic
379379
steps:

emcc.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2192,8 +2192,6 @@ def check_memory_setting(setting):
21922192
if not settings.UBSAN_RUNTIME:
21932193
settings.UBSAN_RUNTIME = 2
21942194

2195-
settings.EXPORTED_FUNCTIONS.append('_emscripten_builtin_memset')
2196-
21972195
# helper functions for JS to call into C to do memory operations. these
21982196
# let us sanitize memory access from the JS side, by calling into C where
21992197
# it has been instrumented.

src/library.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3068,9 +3068,6 @@ LibraryManager.library = {
30683068
// When lsan or asan is enabled withBuiltinMalloc temporarily replaces calls
30693069
// to malloc, free, and memalign.
30703070
$withBuiltinMalloc__deps: ['emscripten_builtin_malloc', 'emscripten_builtin_free', 'emscripten_builtin_memalign'
3071-
#if USE_ASAN
3072-
, 'emscripten_builtin_memset'
3073-
#endif
30743071
],
30753072
$withBuiltinMalloc__docs: '/** @suppress{checkTypes} */',
30763073
$withBuiltinMalloc: function (func) {
@@ -3080,19 +3077,12 @@ LibraryManager.library = {
30803077
_malloc = _emscripten_builtin_malloc;
30813078
_memalign = _emscripten_builtin_memalign;
30823079
_free = _emscripten_builtin_free;
3083-
#if USE_ASAN
3084-
var prev_memset = typeof _memset !== 'undefined' ? _memset : undefined
3085-
_memset = _emscripten_builtin_memset;
3086-
#endif
30873080
try {
30883081
return func();
30893082
} finally {
30903083
_malloc = prev_malloc;
30913084
_memalign = prev_memalign;
30923085
_free = prev_free;
3093-
#if USE_ASAN
3094-
_memset = prev_memset;
3095-
#endif
30963086
}
30973087
},
30983088
#endif

0 commit comments

Comments
 (0)