From 272985d3d1b36833ebd586e5f051ac3a4ab0cd91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 3 Dec 2015 15:42:02 +0100
Subject: Add has_prepared_code_on_load/1 BIF

---
 erts/emulator/beam/beam_bif_load.c      | 19 +++++++++++++++++++
 erts/emulator/beam/bif.tab              |  1 +
 erts/emulator/test/multi_load_SUITE.erl |  6 ++++++
 erts/preloaded/src/erlang.erl           | 10 +++++++++-
 4 files changed, 35 insertions(+), 1 deletion(-)

(limited to 'erts')

diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c
index d426b6eebb..0b47fc3586 100644
--- a/erts/emulator/beam/beam_bif_load.c
+++ b/erts/emulator/beam/beam_bif_load.c
@@ -139,6 +139,25 @@ prepare_loading_2(BIF_ALIST_2)
     BIF_RET(res);
 }
 
+BIF_RETTYPE
+has_prepared_code_on_load_1(BIF_ALIST_1)
+{
+    Eterm res;
+    ProcBin* pb;
+
+    if (!ERTS_TERM_IS_MAGIC_BINARY(BIF_ARG_1)) {
+    error:
+	BIF_ERROR(BIF_P, BADARG);
+    }
+
+    pb = (ProcBin*) binary_val(BIF_ARG_1);
+    res = erts_has_code_on_load(pb->val);
+    if (res == NIL) {
+	goto error;
+    }
+    BIF_RET(res);
+}
+
 struct m {
     Binary* code;
     Eterm module;
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 4efc055aaf..5c84b9c0eb 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -649,6 +649,7 @@ bif binary:split/2
 bif binary:split/3
 bif erts_debug:size_shared/1
 bif erts_debug:copy_shared/1
+bif erlang:has_prepared_code_on_load/1
 
 #
 # Obsolete
diff --git a/erts/emulator/test/multi_load_SUITE.erl b/erts/emulator/test/multi_load_SUITE.erl
index 33e6c15f8f..784b239116 100644
--- a/erts/emulator/test/multi_load_SUITE.erl
+++ b/erts/emulator/test/multi_load_SUITE.erl
@@ -126,6 +126,12 @@ on_load(_Config) ->
     MixedPrep = prepare_modules(Mixed),
     {'EXIT',{system_limit,_}} = (catch erlang:finish_loading(MixedPrep)),
 
+    [false,true] = [erlang:has_prepared_code_on_load(Code) ||
+		       Code <- MixedPrep],
+    {'EXIT',{badarg,_}} = (catch erlang:has_prepared_code_on_load(<<1,2,3>>)),
+    Magic = ets:match_spec_compile([{'_',[true],['$_']}]),
+    {'EXIT',{badarg,_}} = (catch erlang:has_prepared_code_on_load(Magic)),
+
     SingleOnPrep = tl(OnPrep),
     {on_load,[OnLoadMod]} = erlang:finish_loading(SingleOnPrep),
     ok = erlang:call_on_load_function(OnLoadMod),
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index ab51cf385c..9bf8d13fde 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -105,7 +105,9 @@
 -export([garbage_collect/0, garbage_collect/1, garbage_collect/2]).
 -export([garbage_collect_message_area/0, get/0, get/1, get_keys/0, get_keys/1]).
 -export([get_module_info/1, get_stacktrace/0, group_leader/0]).
--export([group_leader/2, halt/0, halt/1, halt/2, hash/2, hibernate/3]).
+-export([group_leader/2]).
+-export([halt/0, halt/1, halt/2, hash/2,
+	 has_prepared_code_on_load/1, hibernate/3]).
 -export([insert_element/3]).
 -export([integer_to_binary/1, integer_to_list/1]).
 -export([iolist_size/1, iolist_to_binary/1]).
@@ -997,6 +999,12 @@ halt(_Status, _Options) ->
 hash(_Term, _Range) ->
     erlang:nif_error(undefined).
 
+%% has_prepared_code_on_load/1
+-spec erlang:has_prepared_code_on_load(PreparedCode) -> boolean() when
+      PreparedCode :: binary().
+has_prepared_code_on_load(_PreparedCode) ->
+    erlang:nif_error(undefined).
+
 %% hibernate/3
 -spec erlang:hibernate(Module, Function, Args) -> no_return() when
       Module :: module(),
-- 
cgit v1.2.3