Merge branch 'maint'

* maint:
  Remove stale code for hybrid heap and incremental GC
  Remove the hipe_bifs:show_message_area/0 BIF
  Remove support for erlang:system_info(global_heaps_size)
  Remove the erlang:garbage_collect_message_area/0 BIF
  Remove workarounds for hybrid and shared heaps in test suites

Conflicts:
	erts/doc/src/erlang.xml
	erts/emulator/beam/erl_message.c
	erts/emulator/beam/erl_process.c
	erts/emulator/beam/erl_process.h
	erts/emulator/hipe/hipe_bif2.tab
	lib/hipe/cerl/erl_bif_types.erl

1 files changed, 2 insertions, 57 deletions

diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index eb98d2f6dd..e2f7c8673f 100755
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -25,7 +25,6 @@
 #include "erl_vm.h"
 #include "global.h"
 #include "erl_process.h"
-#include "erl_nmgc.h"
 #include "error.h"
 #include "erl_driver.h"
 #include "bif.h"
@@ -89,12 +88,6 @@ static char erts_system_version[] = ("Erlang " ERLANG_OTP_RELEASE
 #ifdef ERTS_ENABLE_KERNEL_POLL
 				     " [kernel-poll:%s]"
 #endif	
-#ifdef HYBRID
-				     " [hybrid heap]"
-#endif
-#ifdef INCREMENTAL
-				     " [incremental GC]"
-#endif
 #ifdef ET_DEBUG
 #if ET_DEBUG
 				     " [type-assertions]"
@@ -576,9 +569,6 @@ static Eterm pi_args[] = {
     am_min_bin_vheap_size,
     am_current_location,
     am_current_stacktrace,
-#ifdef HYBRID
-    am_message_binary
-#endif
 };    
 
 #define ERTS_PI_ARGS ((int) (sizeof(pi_args)/sizeof(Eterm)))
@@ -626,9 +616,6 @@ pi_arg2ix(Eterm arg)
     case am_min_bin_vheap_size:			return 28;
     case am_current_location:			return 29;
     case am_current_stacktrace:			return 30;
-#ifdef HYBRID
-    case am_message_binary:			return 31;
-#endif
     default:					return -1;
     }
 }
@@ -1081,12 +1068,8 @@ process_info_aux(Process *BIF_P,
 		if (rp != BIF_P) {
 		    Eterm msg = ERL_MESSAGE_TERM(mq[i].msgp);
 		    if (is_value(msg)) {
-			mq[i].copy_struct_size = (is_immed(msg)
-#ifdef HYBRID
-						  || NO_COPY(msg)
-#endif
-						  ? 0
-						  : size_object(msg));
+			mq[i].copy_struct_size = (is_immed(msg)? 0 :
+						  size_object(msg));
 		    }
 		    else if (mq[i].msgp->data.attached) {
 			mq[i].copy_struct_size
@@ -1528,16 +1511,6 @@ process_info_aux(Process *BIF_P,
 	break;
     }
 
-#ifdef HYBRID
-    case am_message_binary: {
-	Uint sz = 3;
-	(void) bld_bin_list(NULL, &sz, erts_global_offheap.mso);
-	hp = HAlloc(BIF_P, sz);
-	res = bld_bin_list(&hp, NULL, erts_global_offheap.mso);
-	break;
-    }
-#endif
-
     case am_sequential_trace_token:
 	res = copy_object(rp->seq_trace_token, BIF_P);
 	hp = HAlloc(BIF_P, 3);
@@ -2356,36 +2329,8 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 #endif
     } else if (BIF_ARG_1 == am_heap_sizes) {
 	return erts_heap_sizes(BIF_P);
-    } else if (BIF_ARG_1 == am_global_heaps_size) {
-#ifdef HYBRID
-	Uint hsz = 0;
-	Uint sz = 0;
-
-	sz += global_heap_sz;
-#ifdef INCREMENTAL
-        /* The size of the old generation is a bit hard to define here...
-         * The amount of live data in the last collection perhaps..? */
-        sz = 0;
-#else
-	if (global_old_hend && global_old_heap)
-	    sz += global_old_hend - global_old_heap;
-#endif
-
-	sz *= sizeof(Eterm);
-
-	(void) erts_bld_uint(NULL, &hsz, sz);
-	hp = hsz ? HAlloc(BIF_P, hsz) : NULL;
-	res = erts_bld_uint(&hp, NULL, sz);
-#else
-	res = make_small(0);
-#endif
-	return res;
     } else if (BIF_ARG_1 == am_heap_type) {
-#if defined(HYBRID)
-        return am_hybrid;
-#else
 	return am_private;
-#endif
     } else if (ERTS_IS_ATOM_STR("cpu_topology", BIF_ARG_1)) {
 	res = erts_get_cpu_topology_term(BIF_P, am_used);
 	BIF_TRAP1(erts_format_cpu_topology_trap, BIF_P, res);