Skip to content

Commit e5f3e7f

Browse files
authored
Minor debugging improvements from esm-integration work. NFC (#24296)
1 parent e44ca5e commit e5f3e7f

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/lib/libbrowser.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,8 @@ var LibraryBrowser = {
691691
var data = await readAsync(url, false);
692692
eval(data);
693693
loadDone();
694-
} catch {
694+
} catch (e) {
695+
err(e);
695696
loadError();
696697
}
697698
return;

src/lib/libstack_trace.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ var LibraryStackTrace = {
105105
abort('Cannot use convertFrameToPC (needed by __builtin_return_address) without -sUSE_OFFSET_CONVERTER');
106106
#else
107107
#if ASSERTIONS
108-
assert(wasmOffsetConverter);
108+
assert(wasmOffsetConverter, 'wasmOffsetConverter global not found');
109109
#endif
110110
var match;
111111

test/core/test_asyncify_assertions.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,16 @@
33

44
EM_JS(void, suspend, (), {
55
Asyncify.handleSleep((wakeUp) => {
6-
Module.resume = wakeUp;
7-
setTimeout(function() {
8-
Module._resume_from_inside_c();
9-
}, 1);
6+
Module.doResume = wakeUp;
7+
setTimeout(() => _resume_from_inside_c(), 1);
108
});
119
});
1210

1311
EM_JS(void, resume, (), {
14-
Module.resume();
12+
Module.doResume();
1513
});
1614

17-
EMSCRIPTEN_KEEPALIVE
18-
void resume_from_inside_c() {
15+
EMSCRIPTEN_KEEPALIVE void resume_from_inside_c() {
1916
// A C function that then resumes. This C code will be on the stack as we
2017
// try to resume, but that is invalid - we need to start a resume from the
2118
// *outside* of the wasm module. An assertion should catch this.

test/test_emscripten_async_load_script.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ void load2() {
3939
}
4040

4141
void error2() {
42-
printf("fail2\n");
42+
printf("failed to load second script\n");
43+
assert(false);
4344
}
4445

4546
void load1() {
@@ -49,7 +50,8 @@ void load1() {
4950
}
5051

5152
void error1() {
52-
printf("fail1\n");
53+
printf("failed to load first script\n");
54+
assert(false);
5355
}
5456

5557
int main() {

0 commit comments

Comments
 (0)