diff options
author | Sverker Eriksson <[email protected]> | 2017-03-28 11:56:43 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2017-03-28 11:56:43 +0200 |
commit | deaa890b3da0be617c9f62c968ba829c146fb2d6 (patch) | |
tree | 1e982126c0f42b246caa35a9d211c55d47a30f9f /erts/emulator/hipe/hipe_mode_switch.c | |
parent | 8e44a7ef60248eec658cfc81ad1110bc72a937c7 (diff) | |
parent | 29bf1c9b7f33d64871c0f973be4a732850d98572 (diff) | |
download | otp-deaa890b3da0be617c9f62c968ba829c146fb2d6.tar.gz otp-deaa890b3da0be617c9f62c968ba829c146fb2d6.tar.bz2 otp-deaa890b3da0be617c9f62c968ba829c146fb2d6.zip |
Merge branch 'sverker/hipe-long-lived'
* sverker/hipe-long-lived:
Make hipe_bifs:alloc_data/3 pad addr to alignment
erts: Change HIPE allocations from sys_alloc
Diffstat (limited to 'erts/emulator/hipe/hipe_mode_switch.c')
-rw-r--r-- | erts/emulator/hipe/hipe_mode_switch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/hipe/hipe_mode_switch.c b/erts/emulator/hipe/hipe_mode_switch.c index f11223d8b0..712f65f629 100644 --- a/erts/emulator/hipe/hipe_mode_switch.c +++ b/erts/emulator/hipe/hipe_mode_switch.c @@ -664,7 +664,7 @@ void hipe_inc_nstack(Process *p) { unsigned old_size = p->hipe.nstend - p->hipe.nstack; unsigned new_size = hipe_next_nstack_size(old_size); - Eterm *new_nstack = erts_alloc(ERTS_ALC_T_HIPE, new_size*sizeof(Eterm)); + Eterm *new_nstack = erts_alloc(ERTS_ALC_T_HIPE_STK, new_size*sizeof(Eterm)); unsigned used_size = p->hipe.nstend - p->hipe.nsp; sys_memcpy(new_nstack+new_size-used_size, p->hipe.nsp, used_size*sizeof(Eterm)); @@ -673,7 +673,7 @@ void hipe_inc_nstack(Process *p) if (p->hipe.nstblacklim) p->hipe.nstblacklim = new_nstack + new_size - (p->hipe.nstend - p->hipe.nstblacklim); if (p->hipe.nstack) - erts_free(ERTS_ALC_T_HIPE, p->hipe.nstack); + erts_free(ERTS_ALC_T_HIPE_STK, p->hipe.nstack); p->hipe.nstack = new_nstack; p->hipe.nstend = new_nstack + new_size; p->hipe.nsp = new_nstack + new_size - used_size; @@ -683,7 +683,7 @@ void hipe_inc_nstack(Process *p) void hipe_empty_nstack(Process *p) { if (p->hipe.nstack) { - erts_free(ERTS_ALC_T_HIPE, p->hipe.nstack); + erts_free(ERTS_ALC_T_HIPE_STK, p->hipe.nstack); } p->hipe.nstgraylim = NULL; p->hipe.nsp = NULL; |