Skip to content

Add helper function for C++ exception formatting #16343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 30 commits into from
Feb 24, 2022
Merged

Add helper function for C++ exception formatting #16343

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3cf21a0
Wrote format_exception function and hard coded inclusion into system_…
hoodmane Feb 18, 2022
2ea06c8
Add Javascript wrapper, miscellaneous cleanup
hoodmane Feb 19, 2022
693f677
Fix formatting
hoodmane Feb 19, 2022
95ef456
No need for exportedAsmFunction
hoodmane Feb 20, 2022
103dca8
Use withStackSave
hoodmane Feb 20, 2022
cc31016
Free the right thing
hoodmane Feb 20, 2022
5ca4f18
Use stackAlloc({{{ POINTER_SIZE }}});
hoodmane Feb 20, 2022
aa15cc8
Remove accidental change
hoodmane Feb 20, 2022
493e22f
Add final newline to format_exception.cpp
hoodmane Feb 20, 2022
c7d1267
Add emscripten_ prefix to format_exception
hoodmane Feb 20, 2022
0231037
Add format_exception.cpp to libcxxabi
hoodmane Feb 20, 2022
af456b1
Use withStackSave correctly
hoodmane Feb 20, 2022
e233943
Remove libformatexception library
hoodmane Feb 20, 2022
83a1a4a
Various fixes
hoodmane Feb 20, 2022
5e765ab
Add test
hoodmane Feb 20, 2022
1235600
Remove addresses from test comparison
hoodmane Feb 20, 2022
a83007e
Try to fix test
hoodmane Feb 21, 2022
5f19ef5
Fix wasm-exceptions test
hoodmane Feb 21, 2022
86b703b
Fix test
hoodmane Feb 21, 2022
a773e9b
Fix INCLUDE_FULL_LIBRARY test
hoodmane Feb 21, 2022
16f160d
Fix flake8
hoodmane Feb 21, 2022
fbcf6da
Formatting fixes from sbc100
hoodmane Feb 22, 2022
8ad7932
Fix test
hoodmane Feb 22, 2022
68c129e
Return char* instead of returning by value to avoid stackAlloc
hoodmane Feb 22, 2022
c11d036
Remove FORMAT_EXCEPTION_SUPPORT setting
hoodmane Feb 22, 2022
9c0b0a6
Address more review comments
hoodmane Feb 22, 2022
439c09f
Address more review comments
hoodmane Feb 22, 2022
77376ea
Remove unneeded setting
hoodmane Feb 22, 2022
8dad972
Add formatException to EXPORTED_FUNCTIONS rather than EXPORTED_RUNTIM…
hoodmane Feb 22, 2022
dcc15f5
Edits from code review
hoodmane Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Try to fix test
  • Loading branch information
@hoodmane
hoodmane committed Feb 21, 2022
commit a83007e375133243f989f64c874d3fef73636400
2 changes: 1 addition & 1 deletion tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,12 +1543,12 @@ def test_exceptions_rethrow_missing(self):
create_file('main.cpp', 'int main() { throw; }')
self.do_runf('main.cpp', None, assert_returncode=NON_ZERO)

@with_both_eh_sjlj
def test_format_exception(self):
Copy link
Collaborator

@sbc100 sbc100 Feb 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add @with_both_eh_sjlj to this test?

Copy link
Collaborator

@sbc100 sbc100 Feb 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then you can also remove DISABLE_EXCEPTION_CATCHING below.

Copy link
Collaborator Author

@hoodmane hoodmane Feb 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't work with wasm-exceptions. I am not sure how to make it work with wasm-exceptions, if you like I can look into it. It would probably be entertaining. But I think it should be a separate PR.

Copy link
Collaborator

@sbc100 sbc100 Feb 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, can you open a bug about that so that we remember to get it fixed. I imagine @aheejin will want it to work for sure.

Copy link
Collaborator Author

@hoodmane hoodmane Feb 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I opened #16380 which is where I got stuck in the wasm-exceptions case.

# needs to flush stdio streams
self.set_setting('EXIT_RUNTIME')
self.set_setting('EXPORTED_FUNCTIONS', ['_main', '_throw_exc'])
self.set_setting('FORMAT_EXCEPTION_SUPPORT')
self.set_setting('DISABLE_EXCEPTION_CATCHING', 0)
self.maybe_closure()
self.do_run(
"""
Expand Down