From 0c480fab8830febf8911d2eb6618a144dc90b8cc Mon Sep 17 00:00:00 2001
From: Kostis Sagonas <kostis@it.uu.se>
Date: Tue, 18 Oct 2016 13:08:17 +0200
Subject: Change the return type of hipe_bifs:add_ref/2

---
 lib/hipe/cerl/erl_bif_types.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index ae9650ba7d..9344eb33fe 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -1003,7 +1003,7 @@ type(erlang, tuple_to_list, 1, Xs, Opaques) ->
 	 end, Opaques);
 %%-- hipe_bifs ----------------------------------------------------------------
 type(hipe_bifs, add_ref, 2, Xs, Opaques) ->
-  strict(hipe_bifs, add_ref, 2, Xs, fun (_) -> t_nil() end, Opaques);
+  strict(hipe_bifs, add_ref, 2, Xs, fun (_) -> t_atom('ok') end, Opaques);
 type(hipe_bifs, alloc_data, 3, Xs, Opaques) ->
   strict(hipe_bifs, alloc_data, 3, Xs,
 	 fun (_) -> t_integer() end, Opaques); % address
-- 
cgit v1.2.3


From 0c7e4330ddced978934dd63520795554b29244a2 Mon Sep 17 00:00:00 2001
From: Kostis Sagonas <kostis@it.uu.se>
Date: Tue, 18 Oct 2016 13:08:38 +0200
Subject: Code cleanup to remove confusing assertion

The code of add_ref/6 contained an assertion that somehow appeared
twice.  Also, a recent commit (2b2de61) suppressed an unmatched
return warning in a non-optimal way.  By changing the return type
of hipe_bifs:add_ref/2 to be 'ok' instead of [] the code can be
cleaned up and simplified.

While at it, fixed the wrong indentation of some nearby code.
---
 lib/kernel/src/hipe_unified_loader.erl | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'lib')

diff --git a/lib/kernel/src/hipe_unified_loader.erl b/lib/kernel/src/hipe_unified_loader.erl
index a7e30a048f..ce7408a3cc 100644
--- a/lib/kernel/src/hipe_unified_loader.erl
+++ b/lib/kernel/src/hipe_unified_loader.erl
@@ -772,27 +772,26 @@ find_const(ConstNo, []) ->
 
 add_ref(CalleeMFA, Address, FunDefs, RefType, Trampoline, RemoteOrLocal) ->
   CallerMFA = address_to_mfa_lth(Address, FunDefs),
-  _  = case RemoteOrLocal of
+  case RemoteOrLocal of
     local ->
       %% just a sanity assertion
-      {M,_,_} = CalleeMFA,
-      {M,_,_} = CallerMFA;
+      {_M,_,_} = CalleeMFA,
+      ok;
     remote ->
       hipe_bifs:add_ref(CalleeMFA, {CallerMFA,Address,RefType,Trampoline,
 				    get(hipe_loader_state)})
-  end,
-  ok.
+  end.
 
-% For FunDefs sorted from low to high addresses
+%% For FunDefs sorted from low to high addresses
 address_to_mfa_lth(Address, FunDefs) ->
-    case address_to_mfa_lth(Address, FunDefs, false) of
-	false ->
-	    ?error_msg("Local adddress not found ~w\n",[Address]),
-	    exit({?MODULE, local_address_not_found});
-	MFA ->
-	    MFA
-    end.
-    
+  case address_to_mfa_lth(Address, FunDefs, false) of
+    false ->
+      ?error_msg("Local adddress not found ~w\n",[Address]),
+      exit({?MODULE, local_address_not_found});
+    MFA ->
+      MFA
+  end.
+
 address_to_mfa_lth(Address, [#fundef{address=Adr, mfa=MFA}|Rest], Prev) ->
   if Address < Adr -> 
 	  Prev;
@@ -802,7 +801,7 @@ address_to_mfa_lth(Address, [#fundef{address=Adr, mfa=MFA}|Rest], Prev) ->
 address_to_mfa_lth(_Address, [], Prev) -> 
     Prev.
 
-% For FunDefs sorted from high to low addresses
+%% For FunDefs sorted from high to low addresses
 %% address_to_mfa_htl(Address, [#fundef{address=Adr, mfa=MFA}|_Rest]) when Address >= Adr -> MFA;
 %% address_to_mfa_htl(Address, [_ | Rest]) -> address_to_mfa_htl(Address, Rest);
 %% address_to_mfa_htl(Address, []) -> 
@@ -868,8 +867,6 @@ assert_local_patch(Address) when is_integer(Address) ->
 %% ____________________________________________________________________
 %% 
 
-%% Beam: nil() | binary()  (used as a flag)
-
 enter_code(CodeSize, CodeBinary, CalleeMFAs, LoaderState) ->
   true = byte_size(CodeBinary) =:= CodeSize,
   {CodeAddress,Trampolines} = hipe_bifs:enter_code(CodeBinary, CalleeMFAs,
-- 
cgit v1.2.3


From a79e2569f5a6d6a622bd78b04326a6ad976c0a4c Mon Sep 17 00:00:00 2001
From: Kostis Sagonas <kostis@it.uu.se>
Date: Tue, 18 Oct 2016 14:03:41 +0200
Subject: Restore the erroneously taken out assertion

---
 lib/kernel/src/hipe_unified_loader.erl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/kernel/src/hipe_unified_loader.erl b/lib/kernel/src/hipe_unified_loader.erl
index ce7408a3cc..04ec1479cb 100644
--- a/lib/kernel/src/hipe_unified_loader.erl
+++ b/lib/kernel/src/hipe_unified_loader.erl
@@ -774,8 +774,9 @@ add_ref(CalleeMFA, Address, FunDefs, RefType, Trampoline, RemoteOrLocal) ->
   CallerMFA = address_to_mfa_lth(Address, FunDefs),
   case RemoteOrLocal of
     local ->
-      %% just a sanity assertion
-      {_M,_,_} = CalleeMFA,
+      %% assert that the callee and caller are from the same module
+      {M,_,_} = CalleeMFA,
+      {M,_,_} = CallerMFA,
       ok;
     remote ->
       hipe_bifs:add_ref(CalleeMFA, {CallerMFA,Address,RefType,Trampoline,
-- 
cgit v1.2.3