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/beam/beam_load.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/beam/beam_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 48206a75a8..6eea963016 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -6321,7 +6321,7 @@ erts_make_stub_module(Process* p, Eterm hipe_magic_bin, Eterm Beam, Eterm Info) */ magic = erts_alloc_loader_state(); stp = ERTS_MAGIC_BIN_DATA(magic); - hipe_code = erts_alloc(ERTS_ALC_T_HIPE, sizeof(*hipe_code)); + hipe_code = erts_alloc(ERTS_ALC_T_HIPE_LL, sizeof(*hipe_code)); if (!is_internal_magic_ref(hipe_magic_bin) || !(hipe_magic = erts_magic_ref2bin(hipe_magic_bin), @@ -6556,7 +6556,7 @@ erts_make_stub_module(Process* p, Eterm hipe_magic_bin, Eterm Beam, Eterm Info) } error: - erts_free(ERTS_ALC_T_HIPE, hipe_code); + erts_free(ERTS_ALC_T_HIPE_LL, hipe_code); erts_free_aligned_binary_bytes(temp_alloc); free_loader_state(magic); BIF_ERROR(p, BADARG); @@ -6583,7 +6583,7 @@ int erts_commit_hipe_patch_load(Eterm hipe_magic_bin) /* * Initialise HiPE module */ - hipe_code = erts_alloc(ERTS_ALC_T_HIPE, sizeof(*hipe_code)); + hipe_code = erts_alloc(ERTS_ALC_T_HIPE_LL, sizeof(*hipe_code)); hipe_code->text_segment = hipe_stp->text_segment; hipe_code->text_segment_size = hipe_stp->text_segment_size; hipe_code->data_segment = hipe_stp->data_segment; |