Skip to content

Commit 27348cf

Browse files
sunfishcodesunfishcode
committed
Change size_t and friends to use long types.
1 parent dd42cc0 commit 27348cf

File tree

9 files changed

+847
-847
lines changed

9 files changed

+847
-847
lines changed

‎emscripten-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"1.38.9"
1+
"1.38.10"

‎system/lib/libc/musl/arch/emscripten/bits/alltypes.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#define _Addr int
2-
#define _Int64 long long
3-
#define _Reg int
1+
#define _Addr __PTRDIFF_TYPE__
2+
#define _Int64 __INT64_TYPE__
3+
#define _Reg __PTRDIFF_TYPE__
44

55
#if __GNUC__ >= 3
66
#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)

‎system/lib/libc/musl/arch/emscripten/bits/alltypes.h.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#define _Addr int
2-
#define _Int64 long long
3-
#define _Reg int
1+
#define _Addr __PTRDIFF_TYPE__
2+
#define _Int64 __INT64_TYPE__
3+
#define _Reg __PTRDIFF_TYPE__
44

55
TYPEDEF __builtin_va_list va_list;
66
TYPEDEF __builtin_va_list __isoc_va_list;

‎system/lib/libcxx/symbols

Lines changed: 785 additions & 785 deletions
Large diffs are not rendered by default.

‎system/lib/libcxxabi/symbols

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -254,17 +254,17 @@
254254
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairaSEOS1_
255255
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ENSt3__212basic_stringIcNS2_11char_traitsIcEENS0_12malloc_allocIcEEEE
256256
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2EOS1_
257-
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILj10EEERAT__Kc
258-
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILj11EEERAT__Kc
259-
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILj12EEERAT__Kc
260-
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILj13EEERAT__Kc
261-
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILj14EEERAT__Kc
262-
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILj15EEERAT__Kc
263-
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILj18EEERAT__Kc
264-
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILj4EEERAT__Kc
265-
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILj5EEERAT__Kc
266-
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILj6EEERAT__Kc
267-
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILj9EEERAT__Kc
257+
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILm10EEERAT__Kc
258+
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILm11EEERAT__Kc
259+
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILm12EEERAT__Kc
260+
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILm13EEERAT__Kc
261+
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILm14EEERAT__Kc
262+
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILm15EEERAT__Kc
263+
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILm18EEERAT__Kc
264+
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILm4EEERAT__Kc
265+
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILm5EEERAT__Kc
266+
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILm6EEERAT__Kc
267+
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairC2ILm9EEERAT__Kc
268268
-------- t _ZN10__cxxabiv112_GLOBAL__N_111string_pairD2Ev
269269
-------- t _ZN10__cxxabiv112_GLOBAL__N_112parse_numberEPKcS2_
270270
-------- t _ZN10__cxxabiv112_GLOBAL__N_114parse_decltypeINS0_2DbEEEPKcS4_S4_RT_
@@ -277,7 +277,7 @@
277277
-------- t _ZN10__cxxabiv112_GLOBAL__N_118parse_expr_primaryINS0_2DbEEEPKcS4_S4_RT_
278278
-------- t _ZN10__cxxabiv112_GLOBAL__N_118parse_substitutionINS0_2DbEEEPKcS4_S4_RT_
279279
-------- t _ZN10__cxxabiv112_GLOBAL__N_118parse_template_argINS0_2DbEEEPKcS4_S4_RT_
280-
-------- t _ZN10__cxxabiv112_GLOBAL__N_119parse_cv_qualifiersEPKcS2_Rj
280+
-------- t _ZN10__cxxabiv112_GLOBAL__N_119parse_cv_qualifiersEPKcS2_Rm
281281
-------- t _ZN10__cxxabiv112_GLOBAL__N_119parse_discriminatorEPKcS2_
282282
-------- t _ZN10__cxxabiv112_GLOBAL__N_119parse_operator_nameINS0_2DbEEEPKcS4_S4_RT_
283283
-------- t _ZN10__cxxabiv112_GLOBAL__N_119parse_template_argsINS0_2DbEEEPKcS4_S4_RT_
@@ -291,8 +291,8 @@
291291
-------- t _ZN10__cxxabiv112_GLOBAL__N_123parse_prefix_expressionINS0_2DbEEEPKcS4_S4_RKNT_6StringERS5_
292292
-------- t _ZN10__cxxabiv112_GLOBAL__N_126parse_base_unresolved_nameINS0_2DbEEEPKcS4_S4_RT_
293293
-------- t _ZN10__cxxabiv112_GLOBAL__N_12DbD2Ev
294-
-------- t _ZN10__cxxabiv112_GLOBAL__N_15arenaILj4096EE10deallocateEPcj
295-
-------- t _ZN10__cxxabiv112_GLOBAL__N_15arenaILj4096EE8allocateEj
294+
-------- t _ZN10__cxxabiv112_GLOBAL__N_15arenaILm4096EE10deallocateEPcm
295+
-------- t _ZN10__cxxabiv112_GLOBAL__N_15arenaILm4096EE8allocateEm
296296
-------- t _ZN10__cxxabiv112_GLOBAL__N_18demangleINS0_2DbEEEvPKcS4_RT_Ri
297297
-------- t _ZN10__cxxabiv112_GLOBAL__N_19base_nameINSt3__212basic_stringIcNS2_11char_traitsIcEENS0_12malloc_allocIcEEEEEET_RS9_
298298
-------- t _ZN10__cxxabiv112_GLOBAL__N_19destruct_EPv
@@ -408,34 +408,34 @@
408408
-------- T _ZNSt20bad_array_new_lengthD0Ev
409409
-------- T _ZNSt20bad_array_new_lengthD1Ev
410410
-------- T _ZNSt20bad_array_new_lengthD2Ev
411-
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE21__grow_by_and_replaceEjjjjjjPKc
412-
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE5eraseEjj
411+
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE21__grow_by_and_replaceEmmmmmmPKc
412+
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE5eraseEmm
413413
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6appendEPKc
414-
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6appendEPKcj
414+
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6appendEPKcm
415415
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6appendIPKcEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr38__libcpp_string_gets_noexcept_iteratorISC_EE5valueERS7_E4typeESC_SC_
416-
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6assignEPKcj
417-
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6__initEPKcj
418-
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6__initEPKcjj
419-
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6insertEjPKc
420-
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6insertEjPKcj
421-
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE9__grow_byEjjjjjj
416+
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6assignEPKcm
417+
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6__initEPKcm
418+
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6__initEPKcmm
419+
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6insertEmPKc
420+
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE6insertEmPKcm
421+
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE9__grow_byEmmmmmm
422422
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEE9push_backEc
423423
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEEaSERKS7_
424424
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEEC2ERKS7_
425425
-------- t _ZNSt3__212basic_stringIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEED2Ev
426-
-------- t _ZNSt3__213__vector_baseIN10__cxxabiv112_GLOBAL__N_111string_pairENS2_11short_allocIS3_Lj4096EEEED2Ev
427-
-------- t _ZNSt3__213__vector_baseINS_6vectorIN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lj4096EEEEENS5_IS7_Lj4096EEEED2Ev
428-
-------- t _ZNSt3__213__vector_baseINS_6vectorINS1_IN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lj4096EEEEENS5_IS7_Lj4096EEEEENS5_IS9_Lj4096EEEED2Ev
429-
-------- t _ZNSt3__214__split_bufferIN10__cxxabiv112_GLOBAL__N_111string_pairERNS2_11short_allocIS3_Lj4096EEEEC2EjjS6_
430-
-------- t _ZNSt3__214__split_bufferIN10__cxxabiv112_GLOBAL__N_111string_pairERNS2_11short_allocIS3_Lj4096EEEED2Ev
431-
-------- t _ZNSt3__214__split_bufferINS_6vectorIN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lj4096EEEEERNS5_IS7_Lj4096EEEEC2EjjS9_
432-
-------- t _ZNSt3__214__split_bufferINS_6vectorIN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lj4096EEEEERNS5_IS7_Lj4096EEEED2Ev
433-
-------- t _ZNSt3__214__split_bufferINS_6vectorINS1_IN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lj4096EEEEENS5_IS7_Lj4096EEEEERNS5_IS9_Lj4096EEEEC2EjjSB_
434-
-------- t _ZNSt3__214__split_bufferINS_6vectorINS1_IN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lj4096EEEEENS5_IS7_Lj4096EEEEERNS5_IS9_Lj4096EEEED2Ev
435-
-------- t _ZNSt3__26vectorIN10__cxxabiv112_GLOBAL__N_111string_pairENS2_11short_allocIS3_Lj4096EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE
436-
-------- t _ZNSt3__26vectorIN10__cxxabiv112_GLOBAL__N_111string_pairENS2_11short_allocIS3_Lj4096EEEEC2EjRKS3_RKS5_
437-
-------- t _ZNSt3__26vectorINS0_IN10__cxxabiv112_GLOBAL__N_111string_pairENS2_11short_allocIS3_Lj4096EEEEENS4_IS6_Lj4096EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS7_EE
438-
-------- t _ZNSt3__26vectorINS0_INS0_IN10__cxxabiv112_GLOBAL__N_111string_pairENS2_11short_allocIS3_Lj4096EEEEENS4_IS6_Lj4096EEEEENS4_IS8_Lj4096EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE
426+
-------- t _ZNSt3__213__vector_baseIN10__cxxabiv112_GLOBAL__N_111string_pairENS2_11short_allocIS3_Lm4096EEEED2Ev
427+
-------- t _ZNSt3__213__vector_baseINS_6vectorIN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lm4096EEEEENS5_IS7_Lm4096EEEED2Ev
428+
-------- t _ZNSt3__213__vector_baseINS_6vectorINS1_IN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lm4096EEEEENS5_IS7_Lm4096EEEEENS5_IS9_Lm4096EEEED2Ev
429+
-------- t _ZNSt3__214__split_bufferIN10__cxxabiv112_GLOBAL__N_111string_pairERNS2_11short_allocIS3_Lm4096EEEEC2EmmS6_
430+
-------- t _ZNSt3__214__split_bufferIN10__cxxabiv112_GLOBAL__N_111string_pairERNS2_11short_allocIS3_Lm4096EEEED2Ev
431+
-------- t _ZNSt3__214__split_bufferINS_6vectorIN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lm4096EEEEERNS5_IS7_Lm4096EEEEC2EmmS9_
432+
-------- t _ZNSt3__214__split_bufferINS_6vectorIN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lm4096EEEEERNS5_IS7_Lm4096EEEED2Ev
433+
-------- t _ZNSt3__214__split_bufferINS_6vectorINS1_IN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lm4096EEEEENS5_IS7_Lm4096EEEEERNS5_IS9_Lm4096EEEEC2EmmSB_
434+
-------- t _ZNSt3__214__split_bufferINS_6vectorINS1_IN10__cxxabiv112_GLOBAL__N_111string_pairENS3_11short_allocIS4_Lm4096EEEEENS5_IS7_Lm4096EEEEERNS5_IS9_Lm4096EEEED2Ev
435+
-------- t _ZNSt3__26vectorIN10__cxxabiv112_GLOBAL__N_111string_pairENS2_11short_allocIS3_Lm4096EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS3_RS5_EE
436+
-------- t _ZNSt3__26vectorIN10__cxxabiv112_GLOBAL__N_111string_pairENS2_11short_allocIS3_Lm4096EEEEC2EmRKS3_RKS5_
437+
-------- t _ZNSt3__26vectorINS0_IN10__cxxabiv112_GLOBAL__N_111string_pairENS2_11short_allocIS3_Lm4096EEEEENS4_IS6_Lm4096EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS6_RS7_EE
438+
-------- t _ZNSt3__26vectorINS0_INS0_IN10__cxxabiv112_GLOBAL__N_111string_pairENS2_11short_allocIS3_Lm4096EEEEENS4_IS6_Lm4096EEEEENS4_IS8_Lm4096EEEE26__swap_out_circular_bufferERNS_14__split_bufferIS8_RS9_EE
439439
-------- t _ZNSt3__2plIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEEENS_12basic_stringIT_T0_T1_EEPKS8_RKSB_
440440
-------- t _ZNSt3__2plIcNS_11char_traitsIcEEN10__cxxabiv112_GLOBAL__N_112malloc_allocIcEEEENS_12basic_stringIT_T0_T1_EERKSB_PKS8_
441441
-------- T _ZNSt8bad_castC1Ev
@@ -493,11 +493,11 @@
493493
-------- W _ZdaPvRKSt9nothrow_t
494494
-------- W _ZdlPv
495495
-------- W _ZdlPvRKSt9nothrow_t
496-
-------- W _Znaj
497-
-------- W _ZnajRKSt9nothrow_t
496+
-------- W _Znam
497+
-------- W _ZnamRKSt9nothrow_t
498498
-------- W _ZNKSt3__220__vector_base_commonILb1EE20__throw_length_errorEv
499499
-------- W _ZNKSt3__221__basic_string_commonILb1EE20__throw_length_errorEv
500500
-------- W _ZNKSt3__221__basic_string_commonILb1EE20__throw_out_of_rangeEv
501-
-------- W _ZNSt3__211char_traitsIcE7compareEPKcS3_j
502-
-------- W _Znwj
503-
-------- W _ZnwjRKSt9nothrow_t
501+
-------- W _ZNSt3__211char_traitsIcE7compareEPKcS3_m
502+
-------- W _Znwm
503+
-------- W _ZnwmRKSt9nothrow_t

‎tests/cases/i24_ce_fastcomp.ll

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8215,7 +8215,7 @@ declare i32 @sysconf(i32) #5
82158215

82168216
declare i32 @time(i32*) #5
82178217

8218-
define weak i8* @_Znwj(i32 %size) #5 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
8218+
define weak i8* @_Znwm(i32 %size) #5 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
82198219
entry:
82208220
%cmp = icmp eq i32 %size, 0
82218221
%.size = select i1 %cmp, i32 1, i32 %size
@@ -8282,9 +8282,9 @@ declare void @__cxa_throw(i8*, i8*, i8*)
82828282
declare void @__cxa_call_unexpected(i8*)
82838283

82848284
; Function Attrs: nounwind
8285-
define weak noalias i8* @_ZnwjRKSt9nothrow_t(i32 %size, %"struct.std::nothrow_t"*) #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
8285+
define weak noalias i8* @_ZnwmRKSt9nothrow_t(i32 %size, %"struct.std::nothrow_t"*) #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
82868286
entry:
8287-
%call = invoke noalias i8* @_Znwj(i32 %size)
8287+
%call = invoke noalias i8* @_Znwm(i32 %size)
82888288
to label %try.cont unwind label %lpad
82898289

82908290
lpad: ; preds = %entry
@@ -8311,9 +8311,9 @@ declare i8* @__cxa_begin_catch(i8*)
83118311

83128312
declare void @__cxa_end_catch()
83138313

8314-
define weak noalias i8* @_Znaj(i32 %size) #5 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
8314+
define weak noalias i8* @_Znam(i32 %size) #5 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
83158315
entry:
8316-
%call = invoke noalias i8* @_Znwj(i32 %size)
8316+
%call = invoke noalias i8* @_Znwm(i32 %size)
83178317
to label %invoke.cont unwind label %lpad
83188318

83198319
invoke.cont: ; preds = %entry
@@ -8336,9 +8336,9 @@ eh.resume: ; preds = %lpad
83368336
}
83378337

83388338
; Function Attrs: nounwind
8339-
define weak noalias i8* @_ZnajRKSt9nothrow_t(i32 %size, %"struct.std::nothrow_t"*) #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
8339+
define weak noalias i8* @_ZnamRKSt9nothrow_t(i32 %size, %"struct.std::nothrow_t"*) #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
83408340
entry:
8341-
%call = invoke noalias i8* @_Znaj(i32 %size)
8341+
%call = invoke noalias i8* @_Znam(i32 %size)
83428342
to label %try.cont unwind label %lpad
83438343

83448344
lpad: ; preds = %entry

‎tests/optimizer/eliminateDeadGlobals-output.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Module["asm"] = (function(global, env, buffer) {
1212
var STACKTOP = env.STACKTOP | 0;
1313
var _atoi = env._atoi;
1414
var _strlen = env._strlen;
15-
var __Znaj = env.__Znaj;
15+
var __Znam = env.__Znam;
1616
var _puts = env._puts;
1717
var _memcpy = env._memcpy;
1818
var __ZdaPv = env.__ZdaPv;
@@ -39,7 +39,7 @@ Module["asm"] = (function(global, env, buffer) {
3939
i9 = i12 + 2120 | 0;
4040
i11 = i12;
4141
if ((i1 | 0) > 1) i10 = _atoi(HEAP32[i2 + 4 >> 2] | 0) | 0; else i10 = 512;
42-
i8 = __Znaj(347) | 0;
42+
i8 = __Znam(347) | 0;
4343
_memcpy(i8 | 0, 520, 287) | 0;
4444
i1 = i8 + 287 | 0;
4545
i2 = 520;
@@ -54,7 +54,7 @@ Module["asm"] = (function(global, env, buffer) {
5454
i2 = 0;
5555
while (1) {
5656
i7 = i1 >>> 0 < 60 ? i1 : 60;
57-
i4 = __Znaj(i7 + 2 | 0) | 0;
57+
i4 = __Znam(i7 + 2 | 0) | 0;
5858
_memcpy(i4 | 0, i8 + i2 | 0, i7 | 0) | 0;
5959
HEAP8[i4 + i7 >> 0] = 0;
6060
i5 = _strlen(i4 | 0) | 0;

‎tests/optimizer/eliminateDeadGlobals.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Module["asm"] = (function(global,env,buffer) {
5757
var assert=env.assert;
5858
var _atoi=env._atoi;
5959
var _strlen=env._strlen;
60-
var __Znaj=env.__Znaj;
60+
var __Znam=env.__Znam;
6161
var _puts=env._puts;
6262
var _memcpy=env._memcpy;
6363
var ___gxx_personality_v0=env.___gxx_personality_v0;
@@ -89,7 +89,7 @@ function _main(i1, i2) {
8989
i9 = i12 + 2120 | 0;
9090
i11 = i12;
9191
if ((i1 | 0) > 1) i10 = _atoi(HEAP32[i2 + 4 >> 2] | 0) | 0; else i10 = 512;
92-
i8 = __Znaj(347) | 0;
92+
i8 = __Znam(347) | 0;
9393
_memcpy(i8 | 0, 520, 287) | 0;
9494
i1 = i8 + 287 | 0;
9595
i2 = 520;
@@ -104,7 +104,7 @@ function _main(i1, i2) {
104104
i2 = 0;
105105
while (1) {
106106
i7 = i1 >>> 0 < 60 ? i1 : 60;
107-
i4 = __Znaj(i7 + 2 | 0) | 0;
107+
i4 = __Znam(i7 + 2 | 0) | 0;
108108
_memcpy(i4 | 0, i8 + i2 | 0, i7 | 0) | 0;
109109
HEAP8[i4 + i7 >> 0] = 0;
110110
i5 = _strlen(i4 | 0) | 0;

‎tests/test_other.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2473,7 +2473,7 @@ def test_demangle(self):
24732473
two(x % 17);
24742474
}
24752475
int main() {
2476-
EM_ASM(out(demangle('__Znwj'))); // check for no aborts
2476+
EM_ASM(out(demangle('__Znwm'))); // check for no aborts
24772477
EM_ASM(out(demangle('_main')));
24782478
EM_ASM(out(demangle('__Z2f2v')));
24792479
EM_ASM(out(demangle('__Z12abcdabcdabcdi')));

0 commit comments

Comments
 (0)