Skip to content

Commit 114c5aa

Browse files
committed
Rebaseline test_metadce_cxx_mangle.exports
1 parent a113c6b commit 114c5aa

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

test/other/metadce/test_metadce_cxx_mangle.exports

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
__cxa_can_catch
22
__cxa_decrement_exception_refcount
33
__cxa_demangle
4-
<<<<<<< HEAD:test/other/metadce/test_metadce_cxx_mangle.exports
54
__cxa_free_exception
6-
=======
75
__cxa_increment_exception_refcount
8-
>>>>>>> 3efb14451 (Move parts of emscripten exception handling to native code. NFC):tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.exports
96
__cxa_is_pointer_type
107
__errno_location
118
__indirect_function_table
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
30720
1+
30567
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
220423
1+
221340

0 commit comments

Comments
 (0)