Merge branch 'ta/prim_archive-reloading' into maint

* ta/prim_archive-reloading:
  escript_SUITE: remove gratuitous space
  [erts,kernel,stdlib] fix escript/primary archive reloading

Conflicts:
	erts/preloaded/src/erl_prim_loader.erl

OTP-10151

3 files changed, 33 insertions, 4 deletions

diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index 27e70ac4d4..498d850df3 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -22,7 +22,7 @@
 -export([script_name/0, create/2, extract/2]).
 
 %% Internal API.
--export([start/0, start/1]).
+-export([start/0, start/1, parse_file/1]).
 
 %%-----------------------------------------------------------------------
 
@@ -346,7 +346,8 @@ parse_and_run(File, Args, Options) ->
             case Source of
                 archive ->
 		    {ok, FileInfo} = file:read_file_info(File),
-                    case code:set_primary_archive(File, FormsOrBin, FileInfo) of
+                    case code:set_primary_archive(File, FormsOrBin, FileInfo,
+						  fun escript:parse_file/1) of
                         ok when CheckOnly ->
 			    case code:load_file(Module) of
 				{module, _} ->
@@ -396,6 +397,19 @@ parse_and_run(File, Args, Options) ->
 %% Parse script
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%% Only used as callback by erl_prim_loader
+parse_file(File) ->
+    try parse_file(File, false) of
+	{_Source, _Module, FormsOrBin, _HasRecs, _Mode}
+	  when is_binary(FormsOrBin) ->
+	    {ok, FormsOrBin};
+	_ ->
+	    {error, no_archive_bin}
+    catch
+	throw:Reason ->
+	    {error, Reason}
+    end.
+
 parse_file(File, CheckOnly) ->
     {HeaderSz, NextLineNo, Fd, Sections} =
 	parse_header(File, false),
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl
index 253b18ecb0..7b03fdafe3 100644
--- a/lib/stdlib/test/escript_SUITE.erl
+++ b/lib/stdlib/test/escript_SUITE.erl
@@ -358,7 +358,7 @@ beam_script(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Create an archive file containing two entire applications plus two
 %% alternate main modules. Generate a new escript containing the archive
-%% (with .app and .beam files and ) and the escript header.
+%% (with .app and .beam files and) and the escript header.
 
 archive_script(Config) when is_list(Config) ->
     %% Copy the orig files to priv_dir
diff --git a/lib/stdlib/test/escript_SUITE_data/archive_script/archive_script_main2.erl b/lib/stdlib/test/escript_SUITE_data/archive_script/archive_script_main2.erl
index de56579998..431a51b0e5 100644
--- a/lib/stdlib/test/escript_SUITE_data/archive_script/archive_script_main2.erl
+++ b/lib/stdlib/test/escript_SUITE_data/archive_script/archive_script_main2.erl
@@ -21,6 +21,8 @@
 
 -export([main/1]).
 
+-include_lib("kernel/include/file.hrl").
+
 -define(DUMMY, archive_script_dummy).
 -define(DICT, archive_script_dict).
 
@@ -32,7 +34,7 @@ main(MainArgs) ->
     io:format("dummy:~p\n",[[E || E <- ErlArgs, element(1, E) =:= ?DUMMY]]),
 
     %% Start the applications
-    {error, {not_started, ?DICT}} = application:start(archive_script_dummy),
+    {error, {not_started, ?DICT}} = application:start(?DUMMY),
     ok = application:start(?DICT),
     ok = application:start(?DUMMY),
     
@@ -57,4 +59,17 @@ main(MainArgs) ->
     ok = ?DICT:erase(Tab, Key),
     error = ?DICT:find(Tab, Key),
     ok = ?DICT:erase(Tab),
+
+    %% Check mtime related caching bug with escript/primary archive files
+    Escript = escript:script_name(),
+    {ok, FileInfo} = file:read_file_info(Escript),
+    %% Modify mtime of archive file and try to reload module
+    FileInfo2 = FileInfo#file_info{mtime=calendar:now_to_local_time(now())},
+    ok = file:write_file_info(Escript, FileInfo2),
+    Module = ?DICT,
+    {file, _} = code:is_loaded(Module),
+    true = code:delete(Module),
+    false = code:is_loaded(Module),
+    {module, Module} = code:ensure_loaded(Module),
+
     ok.