diff options
| author | Sverker Eriksson <[email protected]> | 2012-08-15 21:05:38 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-08-15 21:05:38 +0200 |
| commit | cd20b76c9acc276c57e5892aa3968fdb359816b9 (patch) | |
| tree | 2f073d3fd44b243ea1828e2299e6391f38ba54db /erts | |
| parent | 8864e40bf063c41a8cda1c9770267ce7f946e4a8 (diff) | |
| parent | 68e0078eb58803dc4a7e0bfd801f32c2c92b7f26 (diff) | |
| download | otp-cd20b76c9acc276c57e5892aa3968fdb359816b9.tar.gz otp-cd20b76c9acc276c57e5892aa3968fdb359816b9.tar.bz2 otp-cd20b76c9acc276c57e5892aa3968fdb359816b9.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_db_util.c | 4 | ||||
| -rw-r--r-- | erts/emulator/beam/external.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c index c2f6cfa933..1aa0cb4552 100644 --- a/erts/emulator/beam/erl_db_util.c +++ b/erts/emulator/beam/erl_db_util.c @@ -2995,7 +2995,7 @@ Eterm db_copy_from_comp(DbTableCommon* tb, DbTerm* bp, Eterm** hpp, } ASSERT((*hpp - hp) <= bp->size); #ifdef DEBUG_CLONE - ASSERT(eq_rel(make_tuple(hp),make_tuple(bp->debug_clone),bp->debug_clone)); + ASSERT(eq_rel(make_tuple(hp),NULL,make_tuple(bp->debug_clone),bp->debug_clone)); #endif return make_tuple(hp); } @@ -3018,7 +3018,7 @@ Eterm db_copy_element_from_ets(DbTableCommon* tb, Process* p, hp += extra; HRelease(p, endp, hp); #ifdef DEBUG_CLONE - ASSERT(eq_rel(copy, obj->debug_clone[pos], obj->debug_clone)); + ASSERT(eq_rel(copy, NULL, obj->debug_clone[pos], obj->debug_clone)); #endif return copy; } diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c index feb1740649..16a987472a 100644 --- a/erts/emulator/beam/external.c +++ b/erts/emulator/beam/external.c @@ -1889,7 +1889,9 @@ enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags, *ep++ = BINARY_INTERNAL_REF; } if (pb->flags) { + char* before_realloc = pb->val->orig_bytes; erts_emasculate_writable_binary(pb); + bytes += (pb->val->orig_bytes - before_realloc); } erts_refc_inc(&pb->val->refc, 2); |