diff options
author | Sverker Eriksson <[email protected]> | 2014-01-10 15:47:16 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2014-01-10 15:47:16 +0100 |
commit | f7f08e93cc1e976cb2b37d450996cde32be8aae2 (patch) | |
tree | e0dca370b4af2c3b9d61cb8876e444ff34c82350 /erts/emulator/beam/erl_gc.c | |
parent | b49efb826e191a0ef18da7ebdb3dd9e56fe654da (diff) | |
download | otp-f7f08e93cc1e976cb2b37d450996cde32be8aae2.tar.gz otp-f7f08e93cc1e976cb2b37d450996cde32be8aae2.tar.bz2 otp-f7f08e93cc1e976cb2b37d450996cde32be8aae2.zip |
erts: Remove the extra_root feature from the process structure
as we don't use it and instead have the feature to disable GC
during trapping BIFs.
Diffstat (limited to 'erts/emulator/beam/erl_gc.c')
-rw-r--r-- | erts/emulator/beam/erl_gc.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index c5585d39e8..8ff6f9a3b9 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2002-2013. All Rights Reserved. + * Copyright Ericsson AB 2002-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 @@ -1975,17 +1975,6 @@ setup_rootset(Process *p, Eterm *objv, int nobj, Rootset *rootset) ++n; } - /* - * A trapping BIF can add to rootset by setting the extra_root - * in the process_structure. - */ - if (p->extra_root != NULL) { - roots[n].v = p->extra_root->objv; - roots[n].sz = p->extra_root->sz; - ++n; - } - - ASSERT((is_nil(p->seq_trace_token) || is_tuple(follow_moved(p->seq_trace_token)) || is_atom(p->seq_trace_token))); @@ -2563,11 +2552,6 @@ offset_one_rootset(Process *p, Sint offs, char* area, Uint area_size, p->dictionary->used, offs, area, area_size); } - if (p->extra_root != NULL) { - offset_heap_ptr(p->extra_root->objv, - p->extra_root->sz, - offs, area, area_size); - } offset_heap_ptr(&p->fvalue, 1, offs, area, area_size); offset_heap_ptr(&p->ftrace, 1, offs, area, area_size); |