Merge branch 'maint'

8 files changed, 64 insertions, 52 deletions

diff --git a/erts/emulator/beam/binary.c b/erts/emulator/beam/binary.c
index ca3e48e205..d4db1a4188 100644
--- a/erts/emulator/beam/binary.c
+++ b/erts/emulator/beam/binary.c
@@ -60,14 +60,36 @@ erts_init_binary(void)
 
 }
 
+static ERTS_INLINE
+Eterm build_proc_bin(ErlOffHeap* ohp, Eterm* hp, Binary* bptr)
+{
+    ProcBin* pb = (ProcBin *) hp;
+    pb->thing_word = HEADER_PROC_BIN;
+    pb->size = bptr->orig_size;
+    pb->next = ohp->first;
+    ohp->first = (struct erl_off_heap_header*)pb;
+    pb->val = bptr;
+    pb->bytes = (byte*) bptr->orig_bytes;
+    pb->flags = 0;
+    OH_OVERHEAD(ohp, pb->size / sizeof(Eterm));
+
+    return make_binary(pb);
+}
+
+/** @brief Initiate a ProcBin for a full Binary.
+ *  @param hp must point to PROC_BIN_SIZE available heap words.
+ */
+Eterm erts_build_proc_bin(ErlOffHeap* ohp, Eterm* hp, Binary* bptr)
+{
+    return build_proc_bin(ohp, hp, bptr);
+}
+
 /*
  * Create a brand new binary from scratch.
  */
-
 Eterm
 new_binary(Process *p, byte *buf, Uint len)
 {
-    ProcBin* pb;
     Binary* bptr;
 
     if (len <= ERL_ONHEAP_BIN_LIMIT) {
@@ -88,23 +110,7 @@ new_binary(Process *p, byte *buf, Uint len)
 	sys_memcpy(bptr->orig_bytes, buf, len);
     }
 
-    /*
-     * Now allocate the ProcBin on the heap.
-     */
-    pb = (ProcBin *) HAlloc(p, PROC_BIN_SIZE);
-    pb->thing_word = HEADER_PROC_BIN;
-    pb->size = len;
-    pb->next = MSO(p).first;
-    MSO(p).first = (struct erl_off_heap_header*)pb;
-    pb->val = bptr;
-    pb->bytes = (byte*) bptr->orig_bytes;
-    pb->flags = 0;
-
-    /*
-     * Miscellaneous updates. Return the tagged binary.
-     */
-    OH_OVERHEAD(&(MSO(p)), pb->size / sizeof(Eterm));
-    return make_binary(pb);
+    return build_proc_bin(&MSO(p), HAlloc(p, PROC_BIN_SIZE), bptr);
 }
 
 /* 
@@ -113,7 +119,6 @@ new_binary(Process *p, byte *buf, Uint len)
 
 Eterm erts_new_mso_binary(Process *p, byte *buf, Uint len)
 {
-    ProcBin* pb;
     Binary* bptr;
 
     /*
@@ -124,23 +129,7 @@ Eterm erts_new_mso_binary(Process *p, byte *buf, Uint len)
 	sys_memcpy(bptr->orig_bytes, buf, len);
     }
 
-    /*
-     * Now allocate the ProcBin on the heap.
-     */
-    pb = (ProcBin *) HAlloc(p, PROC_BIN_SIZE);
-    pb->thing_word = HEADER_PROC_BIN;
-    pb->size = len;
-    pb->next = MSO(p).first;
-    MSO(p).first = (struct erl_off_heap_header*)pb;
-    pb->val = bptr;
-    pb->bytes = (byte*) bptr->orig_bytes;
-    pb->flags = 0;
-
-    /*
-     * Miscellaneous updates. Return the tagged binary.
-     */
-    OH_OVERHEAD(&(MSO(p)), pb->size / sizeof(Eterm));
-    return make_binary(pb);
+    return build_proc_bin(&MSO(p), HAlloc(p, PROC_BIN_SIZE), bptr);
 }
 
 /*
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 52056023fd..903f54e2fb 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -4334,6 +4334,19 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
                 BIF_RET(res);
             }
         }
+        else if (ERTS_IS_ATOM_STR("binary", BIF_ARG_1)) {
+            Sint64 size;
+            if (term_to_Sint64(BIF_ARG_2, &size)) {
+                Binary* refbin = erts_bin_drv_alloc_fnf(size);
+                if (!refbin)
+                    BIF_RET(am_false);
+                sys_memset(refbin->orig_bytes, 0, size);
+                BIF_RET(erts_build_proc_bin(&MSO(BIF_P),
+                                            HAlloc(BIF_P, PROC_BIN_SIZE),
+                                            refbin));
+            }
+        }
+
     }
 
     BIF_ERROR(BIF_P, BADARG);
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index d16ab75178..86e2c351af 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -861,6 +861,7 @@ Eterm erts_new_heap_binary(Process *p, byte *buf, int len, byte** datap);
 Eterm erts_new_mso_binary(Process*, byte*, Uint);
 Eterm new_binary(Process*, byte*, Uint);
 Eterm erts_realloc_binary(Eterm bin, size_t size);
+Eterm erts_build_proc_bin(ErlOffHeap*, Eterm*, Binary*);
 
 /* erl_bif_info.c */
 
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index f3c83b9949..278a485a01 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2454,7 +2454,7 @@ term_to_binary(_Term) ->
       Term :: term(),
       Options :: [compressed |
                   {compressed, Level :: 0..9} |
-                  {minor_version, Version :: 0..1} ].
+                  {minor_version, Version :: 0..2} ].
 term_to_binary(_Term, _Options) ->
     erlang:nif_error(undefined).
 
diff --git a/lib/hipe/test/bs_SUITE_data/bs_construct.erl b/lib/hipe/test/bs_SUITE_data/bs_construct.erl
index b9e7d93570..aa85626857 100644
--- a/lib/hipe/test/bs_SUITE_data/bs_construct.erl
+++ b/lib/hipe/test/bs_SUITE_data/bs_construct.erl
@@ -279,13 +279,22 @@ bad_floats() ->
 %% (incorrectly) signed.
 
 huge_binaries() ->
-  AlmostIllegal = id(<<0:(id((1 bsl 32)-8))>>),
   case erlang:system_info(wordsize) of
-    4 -> huge_binaries_32(AlmostIllegal);
+    4 ->
+      Old = erts_debug:set_internal_state(available_internal_state, true),
+      case erts_debug:set_internal_state(binary, (1 bsl 29)-1) of
+        false ->
+          io:format("\nNot enough memory to create 512Mb binary\n",[]);
+        Bin->
+          huge_binaries_32(Bin)
+      end,
+      erts_debug:set_internal_state(available_internal_state, Old);
+
     8 -> ok
   end,
   garbage_collect(),
   id(<<0:(id((1 bsl 31)-1))>>),
+  garbage_collect(),
   id(<<0:(id((1 bsl 30)-1))>>),
   garbage_collect(),
   ok.
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
index b3a18e03d4..446b46ad82 100644
--- a/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
+++ b/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
@@ -1365,8 +1365,8 @@ static int cmp_strRec(m_strRec *b1, m_strRec *b2)
 	    return 0;
     if (!cmp_str(b1->str6,b2->str6))
 	return 0;
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    if (b1->str7[i][j] != b2->str7[i][j])
 		return 0;
     for (j = 0; j < 3; j++)
@@ -1579,8 +1579,8 @@ static void print_strRec(m_strRec* sr)
     fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
     fprintf(stdout, "string str4 : %s\n",sr->str4);
     fprintf(stdout, "str7[2][3] :\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
     fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
     for (j = 0; j < sr->str5._length; j++)
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c
index 40c7328f03..d6a78d2481 100644
--- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c
@@ -1369,8 +1369,8 @@ static int cmp_strRec(m_strRec *b1, m_strRec *b2)
 	    return 0;
     if (!cmp_str(b1->str6,b2->str6))
 	return 0;
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    if (b1->str7[i][j] != b2->str7[i][j])
 		return 0;
     for (j = 0; j < 3; j++)
@@ -1583,8 +1583,8 @@ static void print_strRec(m_strRec* sr)
     fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
     fprintf(stdout, "string str4 : %s\n",sr->str4);
     fprintf(stdout, "str7[2][3] :\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
     fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
     for (j = 0; j < sr->str5._length; j++)
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
index 33cfe71322..17ef21f4f4 100644
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
@@ -1369,8 +1369,8 @@ static int cmp_strRec(m_strRec *b1, m_strRec *b2)
 	    return 0;
     if (!cmp_str(b1->str6,b2->str6))
 	return 0;
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    if (b1->str7[i][j] != b2->str7[i][j])
 		return 0;
     for (j = 0; j < 3; j++)
@@ -1583,8 +1583,8 @@ static void print_strRec(m_strRec* sr)
     fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
     fprintf(stdout, "string str4 : %s\n",sr->str4);
     fprintf(stdout, "str7[2][3] :\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
+    for (i = 0; i < 3; i++)
+	for (j = 0; j < 2; j++)
 	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
     fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
     for (j = 0; j < sr->str5._length; j++)