diff options
| author | Sverker Eriksson <[email protected]> | 2016-12-05 19:16:48 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-12-05 19:16:48 +0100 |
| commit | 57e0fb97e74c48c502b2eb35990abf4396e04b52 (patch) | |
| tree | f7ebaa2f0acff560d7cebf2934f4994d252bc06c /erts/emulator/beam/atom.c | |
| parent | df2f089ad064f502b8797f53640acdc46187862c (diff) | |
| parent | 6c76bfa96c12b9f29e66baf3a2df7e84bb9b05ef (diff) | |
| download | otp-57e0fb97e74c48c502b2eb35990abf4396e04b52.tar.gz otp-57e0fb97e74c48c502b2eb35990abf4396e04b52.tar.bz2 otp-57e0fb97e74c48c502b2eb35990abf4396e04b52.zip | |
Merge branch 'sverker/secret-atom'
Diffstat (limited to 'erts/emulator/beam/atom.c')
| -rw-r--r-- | erts/emulator/beam/atom.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/atom.c b/erts/emulator/beam/atom.c index b47739059b..2b5ad097a0 100644 --- a/erts/emulator/beam/atom.c +++ b/erts/emulator/beam/atom.c @@ -199,7 +199,7 @@ atom_alloc(Atom* tmpl) static void atom_free(Atom* obj) { - erts_free(ERTS_ALC_T_ATOM, (void*) obj); + ASSERT(obj->slot.index == atom_val(am_ErtsSecretAtom)); } static void latin1_to_utf8(byte* conv_buf, const byte** srcp, int* lenp) @@ -467,6 +467,9 @@ init_atom_table(void) atom_space -= a.len; atom_tab(ix)->name = (byte*)erl_atom_names[i]; } + + /* Hide am_ErtsSecretAtom */ + hash_erase(&erts_atom_table.htable, atom_tab(atom_val(am_ErtsSecretAtom))); } void |