Use magic refs for code loading state

2 files changed, 10 insertions, 10 deletions

diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index 5a7ca493cc..2a06d0cb15 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -489,13 +489,13 @@ prepare_check_uniq_1([], [_|_]=Errors) ->
     {error,Errors}.
 
 partition_on_load(Prep) ->
-    P = fun({_,{Bin,_,_}}) ->
-		erlang:has_prepared_code_on_load(Bin)
+    P = fun({_,{PC,_,_}}) ->
+		erlang:has_prepared_code_on_load(PC)
 	end,
     lists:partition(P, Prep).
 
 verify_prepared([{M,{Prep,Name,_Native}}|T])
-  when is_atom(M), is_binary(Prep), is_list(Name) ->
+  when is_atom(M), is_list(Name) ->
     try erlang:has_prepared_code_on_load(Prep) of
 	false ->
 	    verify_prepared(T);
@@ -562,10 +562,10 @@ prepare_loading_fun() ->
     GetNative = get_native_fun(),
     fun(Mod, FullName, Beam) ->
 	    case erlang:prepare_loading(Mod, Beam) of
-		Prepared when is_binary(Prepared) ->
-		    {ok,{Prepared,FullName,GetNative(Beam)}};
 		{error,_}=Error ->
-		    Error
+		    Error;
+		Prepared ->
+		    {ok,{Prepared,FullName,GetNative(Beam)}}
 	    end
     end.
 
diff --git a/lib/kernel/test/multi_load_SUITE.erl b/lib/kernel/test/multi_load_SUITE.erl
index 369e25ac64..920839f4f9 100644
--- a/lib/kernel/test/multi_load_SUITE.erl
+++ b/lib/kernel/test/multi_load_SUITE.erl
@@ -144,14 +144,14 @@ prep_magic([H|T]) ->
 prep_magic(Tuple) when is_tuple(Tuple) ->
     L = prep_magic(tuple_to_list(Tuple)),
     list_to_tuple(L);
-prep_magic(Bin) when is_binary(Bin) ->
-    try erlang:has_prepared_code_on_load(Bin) of
+prep_magic(Ref) when is_reference(Ref) ->
+    try erlang:has_prepared_code_on_load(Ref) of
 	false ->
-	    %% Create a different kind of magic binary.
+	    %% Create a different kind of magic ref.
 	    ets:match_spec_compile([{'_',[true],['$_']}])
     catch
 	_:_ ->
-	    Bin
+	    Ref
     end;
 prep_magic(Other) ->
     Other.