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_stack.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_stack.c')
| -rw-r--r-- | erts/emulator/hipe/hipe_stack.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/hipe/hipe_stack.c b/erts/emulator/hipe/hipe_stack.c index b80e44bc37..d0f0407489 100644 --- a/erts/emulator/hipe/hipe_stack.c +++ b/erts/emulator/hipe/hipe_stack.c @@ -46,7 +46,7 @@ struct hipe_sdesc_table hipe_sdesc_table; static struct hipe_sdesc **alloc_bucket(unsigned int size) { unsigned long nbytes = size * sizeof(struct hipe_sdesc*); - struct hipe_sdesc **bucket = erts_alloc(ERTS_ALC_T_HIPE, nbytes); + struct hipe_sdesc **bucket = erts_alloc(ERTS_ALC_T_HIPE_LL, nbytes); sys_memzero(bucket, nbytes); return bucket; } @@ -75,7 +75,7 @@ static void hipe_grow_sdesc_table(void) b = next; } } - erts_free(ERTS_ALC_T_HIPE, old_bucket); + erts_free(ERTS_ALC_T_HIPE_LL, old_bucket); } struct hipe_sdesc *hipe_put_sdesc(struct hipe_sdesc *sdesc) @@ -121,7 +121,7 @@ void hipe_destruct_sdesc(struct hipe_sdesc *sdesc) free_me = ErtsContainerStruct(sdesc, struct hipe_sdesc_with_exnra, sdesc); else free_me = sdesc; - erts_free(ERTS_ALC_T_HIPE, free_me); + erts_free(ERTS_ALC_T_HIPE_LL, free_me); } void hipe_init_sdesc_table(struct hipe_sdesc *sdesc) @@ -199,7 +199,7 @@ struct hipe_sdesc *hipe_decode_sdesc(Eterm arg) ? offsetof(struct hipe_sdesc_with_exnra, sdesc.livebits) : offsetof(struct hipe_sdesc, livebits)) + livebitswords * sizeof(int); - p = erts_alloc(ERTS_ALC_T_HIPE, sdescbytes); + p = erts_alloc(ERTS_ALC_T_HIPE_LL, sdescbytes); /* If we have an exception handler use the special sdesc_with_exnra structure. */ if (exnra) { |