diff options
| author | Sverker Eriksson <[email protected]> | 2016-03-01 14:44:50 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-03-01 14:44:50 +0100 |
| commit | 59a0f98dd954b15fda9b2c96878163ffdfff30d1 (patch) | |
| tree | 5ba6370d734f1b9389f465cbccfc83d4104b3ac6 /erts/emulator/hipe/hipe_bif0.c | |
| parent | aa74dd15c39d6b859456aafd78d435763436725d (diff) | |
| parent | 03743cd4193a2ca97f9b9a52a25e63f616e8fc07 (diff) | |
| download | otp-59a0f98dd954b15fda9b2c96878163ffdfff30d1.tar.gz otp-59a0f98dd954b15fda9b2c96878163ffdfff30d1.tar.bz2 otp-59a0f98dd954b15fda9b2c96878163ffdfff30d1.zip | |
Merge branch 'sverk/master/halt-INT_MIN'
* sverk/master/halt-INT_MIN:
erts: Make erlang:halt() accept bignums as Status
erts: Change erl_exit into erts_exit
kernel: Remove calls to erl_exit
Diffstat (limited to 'erts/emulator/hipe/hipe_bif0.c')
| -rw-r--r-- | erts/emulator/hipe/hipe_bif0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c index 6f495b8825..70354aa9af 100644 --- a/erts/emulator/hipe/hipe_bif0.c +++ b/erts/emulator/hipe/hipe_bif0.c @@ -406,7 +406,7 @@ BIF_RETTYPE hipe_bifs_enter_code_2(BIF_ALIST_2) nrcallees = arityval(tuple_val(BIF_ARG_2)[0]); else nrcallees = 0; - erl_exit(1, "%s: failed to allocate %lu bytes and %lu trampolines\r\n", + erts_exit(ERTS_ERROR_EXIT, "%s: failed to allocate %lu bytes and %lu trampolines\r\n", __func__, (unsigned long)nrbytes, (unsigned long)nrcallees); } memcpy(address, bytes, nrbytes); @@ -1322,7 +1322,7 @@ static void *hipe_make_stub(Eterm m, Eterm f, unsigned int arity, int is_remote) export_entry = erts_export_get_or_make_stub(m, f, arity); StubAddress = hipe_make_native_stub(export_entry, arity); if (!StubAddress) - erl_exit(1, "hipe_make_stub: code allocation failed\r\n"); + erts_exit(ERTS_ERROR_EXIT, "hipe_make_stub: code allocation failed\r\n"); return StubAddress; } |