diff options
| author | Sverker Eriksson <[email protected]> | 2014-01-20 18:27:45 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-01-20 18:27:45 +0100 |
| commit | 9b92301dcae72faecdab9f5fe009a53f6d47b8a1 (patch) | |
| tree | 21bce1f644bcc09d74cb0b760f6b468161dcbce3 /erts/emulator/beam/erl_process.c | |
| parent | 1e59e7638ef48732a23a363150738dfd7e314340 (diff) | |
| parent | 172ebf11dc455e22b87f742c06fa6344995d7db5 (diff) | |
| download | otp-9b92301dcae72faecdab9f5fe009a53f6d47b8a1.tar.gz otp-9b92301dcae72faecdab9f5fe009a53f6d47b8a1.tar.bz2 otp-9b92301dcae72faecdab9f5fe009a53f6d47b8a1.zip | |
Merge branch 'sverk/term2bin-simplify'
* sverk/term2bin-simplify:
erts: Refactor ESTACK & WSTACK to use a struct easy to "export"
erts: Fix benign ESTACK/WSTACK typo
erts: Fix compiler warnings for NO_JUMP_TABLE
erts: Run binary_SUITE:trapping even for 32bit
erts: Extend binary_SUITE:ttb_trap to also cover binary_to_term
erts: Remove the extra_root feature from the process structure
erts: Simplify term_to_binary by removing saved ESTACK from root set
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 21fd8dd50a..9983a26688 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2013. All Rights Reserved. + * Copyright Ericsson AB 1996-2014. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -8755,7 +8755,6 @@ erl_create_process(Process* parent, /* Parent of process (default group leader). p->htop = p->heap; p->heap_sz = sz; p->catches = 0; - p->extra_root = NULL; p->bin_vheap_sz = p->min_vheap_size; p->bin_old_vheap_sz = p->min_vheap_size; @@ -10219,12 +10218,6 @@ erts_continue_exit_process(Process *p) if (pbt) erts_free(ERTS_ALC_T_BPD, (void *) pbt); - if (p->extra_root != NULL) { - (p->extra_root->cleanup)(p->extra_root); /* Should deallocate - whole structure */ - p->extra_root = NULL; - } - delete_process(p); #ifdef ERTS_SMP |