Skip to content

Commit 1436e74

Browse files
authored
Cleanup emSetImmediate/emClearImmediate. NFC (emscripten-core#22890)
This change avoids the extra dummy library entry `polyfillSetImmediate`.
1 parent d7f8277 commit 1436e74

7 files changed

+14
-18
lines changed

src/library_eventloop.js

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,8 @@ LibraryJSEventLoop = {
5252
setImmediateWrapped.mapping[id] = undefined;
5353
},
5454

55-
$polyfillSetImmediate__deps: ['$setImmediateWrapped', '$clearImmediateWrapped'],
56-
$polyfillSetImmediate__postset: `
57-
var emSetImmediate;
58-
var emClearImmediate;
55+
$emSetImmediate__deps: ['$setImmediateWrapped', '$clearImmediateWrapped', '$emClearImmediate'],
56+
$emSetImmediate__postset: `
5957
if (typeof setImmediate != "undefined") {
6058
emSetImmediate = setImmediateWrapped;
6159
emClearImmediate = clearImmediateWrapped;
@@ -82,14 +80,12 @@ LibraryJSEventLoop = {
8280
if (index >= 0 && index < __setImmediate_queue.length) __setImmediate_queue[index] = () => {};
8381
})
8482
}`,
83+
$emSetImmediate: undefined,
8584

86-
$polyfillSetImmediate: () => {
87-
// nop, used for its postset to ensure setImmediate() polyfill is
88-
// not duplicated between emscripten_set_immediate() and
89-
// emscripten_set_immediate_loop() if application links to both of them.
90-
},
85+
$emClearImmediate_deps: ['$emSetImmediate'],
86+
$emClearImmediate: undefined,
9187

92-
emscripten_set_immediate__deps: ['$polyfillSetImmediate', '$callUserCallback'],
88+
emscripten_set_immediate__deps: ['$emSetImmediate', '$callUserCallback'],
9389
emscripten_set_immediate: (cb, userData) => {
9490
{{{ runtimeKeepalivePush(); }}}
9591
return emSetImmediate(() => {
@@ -98,13 +94,13 @@ LibraryJSEventLoop = {
9894
});
9995
},
10096

101-
emscripten_clear_immediate__deps: ['$polyfillSetImmediate'],
97+
emscripten_clear_immediate__deps: ['$emClearImmediate'],
10298
emscripten_clear_immediate: (id) => {
10399
{{{ runtimeKeepalivePop(); }}}
104100
emClearImmediate(id);
105101
},
106102

107-
emscripten_set_immediate_loop__deps: ['$polyfillSetImmediate', '$callUserCallback'],
103+
emscripten_set_immediate_loop__deps: ['$emSetImmediate', '$callUserCallback'],
108104
emscripten_set_immediate_loop: (cb, userData) => {
109105
function tick() {
110106
callUserCallback(() => {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7905
1+
7913
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
21012
1+
21045
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6443
1+
6449
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
17061
1+
17094
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
52855
1+
52898
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
51638
1+
51681

0 commit comments

Comments
 (0)