Merge branch 'sverker/refactor'

* sverker/refactor:
  erts: Introduce struct binary_internals
  erts: Introduce erts_bin_release
  erts: Init refc=1 in erts_bin_drv_alloc*
  erts: Init refc=1 in erts_bin_nrml_alloc
  erts: Remove deliberate leak of hipe fun entries
  erts: Remove hipe_bifs:remove_refs_from/1
  Refactor hipe specific code to use ErtsCodeInfo
  erts: Refactor ErtsCodeInfo.native

1 files changed, 2 insertions, 5 deletions

diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index f181c1e3cb..17982a2d14 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -167,9 +167,7 @@ erts_cleanup_offheap(ErlOffHeap *offheap)
     for (u.hdr = offheap->first; u.hdr; u.hdr = u.hdr->next) {
 	switch (thing_subtag(u.hdr->thing_word)) {
 	case REFC_BINARY_SUBTAG:
-	    if (erts_refc_dectest(&u.pb->val->refc, 0) == 0) {
-		erts_bin_free(u.pb->val);
-	    }
+            erts_bin_release(u.pb->val);
 	    break;
 	case FUN_SUBTAG:
 	    if (erts_smp_refc_dectest(&u.fun->fe->refc, 0) == 0) {
@@ -178,8 +176,7 @@ erts_cleanup_offheap(ErlOffHeap *offheap)
 	    break;
 	case REF_SUBTAG:
 	    ASSERT(is_magic_ref_thing(u.hdr));
-	    if (erts_refc_dectest(&u.mref->mb->refc, 0) == 0)
-		erts_bin_free((Binary *)u.mref->mb);		    
+            erts_bin_release((Binary *)u.mref->mb);
 	    break;
 	default:
 	    ASSERT(is_external_header(u.hdr->thing_word));