Merge branch 'sverker/one_offheap_list/OTP-8737' into dev

* sverker/one_offheap_list/OTP-8737:
  One off-heap list, to eliminate two words per ETS object.

3 files changed, 16 insertions, 16 deletions

diff --git a/lib/hipe/rtl/hipe_rtl_primops.erl b/lib/hipe/rtl/hipe_rtl_primops.erl
index 560e0259f8..0361053676 100644
--- a/lib/hipe/rtl/hipe_rtl_primops.erl
+++ b/lib/hipe/rtl/hipe_rtl_primops.erl
@@ -701,9 +701,9 @@ gen_cons(Dst, [Arg1, Arg2]) ->
 %%  Increase refcount
 %%    fe->refc++;
 %%
-%%  Link to the process off_heap.funs list
-%%    funp->next = p->off_heap.funs;
-%%    p->off_heap.funs = funp;
+%%  Link to the process off_heap list
+%%    funp->next = p->off_heap.first;
+%%    p->off_heap.first = funp;
 %%
 %%  Tag the thing
 %%    return make_fun(funp);
@@ -729,9 +729,9 @@ gen_mkfun([Dst], {_Mod, _FunId, _Arity} = MFidA, MagicNr, Index, FreeVars) ->
   %%    fe->refc++;
   SkeletonCode = gen_fun_thing_skeleton(HP, MFidA, NumFree, MagicNr, Index),
 
-  %%  Link to the process off_heap.funs list
-  %%    funp->next = p->off_heap.funs;
-  %%    p->off_heap.funs = funp;
+  %%  Link to the process off_heap list
+  %%    funp->next = p->off_heap.first;
+  %%    p->off_heap.first = funp;
   LinkCode = gen_link_closure(HP),
 
   %%  Tag the thing and increase the heap_pointer.
@@ -797,14 +797,14 @@ gen_link_closure(FUNP) ->
   end.
 
 gen_link_closure_private(FUNP) ->
-  %% Link to the process off_heap.funs list
-  %%   funp->next = p->off_heap.funs;
-  %%   p->off_heap.funs = funp;
+  %% Link fun to the process off_heap list
+  %%   funp->next = p->off_heap.first;
+  %%   p->off_heap.first = funp;
   FunsVar = hipe_rtl:mk_new_reg(),
 
-  [load_p_field(FunsVar,?P_OFF_HEAP_FUNS),
+  [load_p_field(FunsVar,?P_OFF_HEAP_FIRST),
    hipe_rtl:mk_store(FUNP, hipe_rtl:mk_imm(?EFT_NEXT), FunsVar),
-   store_p_field(FUNP,?P_OFF_HEAP_FUNS)].
+   store_p_field(FUNP,?P_OFF_HEAP_FIRST)].
 
 gen_link_closure_non_private(_FUNP) -> [].
 
diff --git a/lib/hipe/rtl/hipe_tagscheme.erl b/lib/hipe/rtl/hipe_tagscheme.erl
index dc44b803a1..c0b6dfad8a 100644
--- a/lib/hipe/rtl/hipe_tagscheme.erl
+++ b/lib/hipe/rtl/hipe_tagscheme.erl
@@ -849,9 +849,9 @@ create_refc_binary(Base, Size, Flags, Dst) ->
 
 heap_arch_spec(HP) ->
   Tmp1 = hipe_rtl:mk_new_reg(), % MSO state
-  [hipe_rtl_arch:pcb_load(Tmp1, ?P_OFF_HEAP_MSO),
+  [hipe_rtl_arch:pcb_load(Tmp1, ?P_OFF_HEAP_FIRST),
    set_field_from_pointer({proc_bin, next}, HP, Tmp1),
-   hipe_rtl_arch:pcb_store(?P_OFF_HEAP_MSO, HP)].
+   hipe_rtl_arch:pcb_store(?P_OFF_HEAP_FIRST, HP)].
 
 test_heap_binary(Binary, TrueLblName, FalseLblName) ->
   Tmp1 = hipe_rtl:mk_new_reg_gcsafe(),
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index fe8e481121..5f26b7d431 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -392,7 +392,7 @@ memory(Config) when is_list(Config) ->
     ?line erts_debug:set_internal_state(available_internal_state, true),
     ?line ok = chk_normal_tab_struct_size(),
     ?line L = [T1,T2,T3,T4] = fill_sets_int(1000),
-    ?line XRes1 = adjust_xmem(L, {16862,16072,16072,16078}),
+    ?line XRes1 = adjust_xmem(L, {14862,14072,14072,14078}),
     ?line Res1 = {?S(T1),?S(T2),?S(T3),?S(T4)},
     ?line lists:foreach(fun(T) ->
  				Before = ets:info(T,size),
@@ -403,7 +403,7 @@ memory(Config) when is_list(Config) ->
 					  [Key, ets:info(T,type), Before, ets:info(T,size), Objs])
 		  end,
 		  L),
-    ?line XRes2 = adjust_xmem(L, {16849,16060,16048,16054}),
+    ?line XRes2 = adjust_xmem(L, {14851,14062,14052,14058}),
     ?line Res2 = {?S(T1),?S(T2),?S(T3),?S(T4)},
     ?line lists:foreach(fun(T) ->
  				Before = ets:info(T,size),
@@ -414,7 +414,7 @@ memory(Config) when is_list(Config) ->
 					  [Key, ets:info(T,type), Before, ets:info(T,size), Objs])
 			end,
 			L),
-    ?line XRes3 = adjust_xmem(L, {16836,16048,16024,16030}),
+    ?line XRes3 = adjust_xmem(L, {14840,14052,14032,14038}),
     ?line Res3 = {?S(T1),?S(T2),?S(T3),?S(T4)},
     ?line lists:foreach(fun(T) ->
 			  ?line ets:delete_all_objects(T)