Merge pull request #1477 from bjorng/bjorn/compiler/fix-native-from-core/ERL-417

Correct handling of module name in compile:forms/1,2

OTP-14408

2 files changed, 31 insertions, 5 deletions

diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index ca85eef688..75bfbf68cc 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -446,7 +446,7 @@ do_bin_opt(Mod, Asm) ->
 do_bin_opt(Transform, Mod, Asm0) ->
     Asm = Transform(Asm0),
     case compile:forms(Asm, [from_asm,no_postopt,return]) of
-	{ok,[],Code,_Warnings} when is_binary(Code) ->
+	{ok,Mod,Code,_Warnings} when is_binary(Code) ->
 	    ok;
 	{error,Errors0,_} ->
 	    %% beam_validator must return errors, not simply crash,
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index f5e904a50a..4e2753ba5f 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -163,6 +163,24 @@ forms_2(Config) when is_list(Config) ->
 	    ok
     end,
 
+    {ok,simple,Core} = compile:forms(SimpleCode, [to_core0,binary]),
+    forms_compile_and_load(Core, [from_core]),
+    forms_compile_and_load(Core, [from_core,native]),
+
+    {ok,simple,Asm} = compile:forms(SimpleCode, [to_asm,binary]),
+    forms_compile_and_load(Asm, [from_asm]),
+    forms_compile_and_load(Asm, [from_asm,native]),
+
+    {ok,simple,Beam} = compile:forms(SimpleCode, []),
+    forms_compile_and_load(Beam, [from_beam]),
+    forms_compile_and_load(Beam, [from_beam,native]),
+
+    %% Cover the error handling code.
+    error = compile:forms(bad_core, [from_core,report]),
+    error = compile:forms(bad_asm, [from_asm,report]),
+    error = compile:forms(<<"bad_beam">>, [from_beam,report]),
+    error = compile:forms(<<"bad_beam">>, [from_beam,native,report]),
+
     ok.
 
 
@@ -180,6 +198,14 @@ forms_load_code(Mod, Src, Bin) ->
 
     SourceOption.
 
+forms_compile_and_load(Code, Opts) ->
+    Mod = simple,
+    {ok,Mod,Bin} = compile:forms(Code, Opts),
+    {module,Mod} = code:load_binary(Mod, "ignore", Bin),
+    _ = Mod:module_info(),
+    true = code:delete(simple),
+    false = code:purge(simple),
+    ok.
 
 module_mismatch(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
@@ -835,7 +861,7 @@ do_core_pp_1(M, A, Outdir) ->
     ok = file:delete(CoreFile),
 
     %% Compile as usual (including optimizations).
-    compile_forms(Core, [clint,from_core,binary]),
+    compile_forms(M, Core, [clint,from_core,binary]),
 
     %% Don't optimize to test that we are not dependent
     %% on the Core Erlang optmimization passes.
@@ -844,13 +870,13 @@ do_core_pp_1(M, A, Outdir) ->
     %% records; if sys_core_fold was run it would fix
     %% that; if sys_core_fold was not run v3_kernel would
     %% crash.)
-    compile_forms(Core, [clint,from_core,no_copt,binary]),
+    compile_forms(M, Core, [clint,from_core,no_copt,binary]),
 
     ok.
 
-compile_forms(Forms, Opts) ->
+compile_forms(Mod, Forms, Opts) ->
     case compile:forms(Forms, [report_errors|Opts]) of
-	{ok,[],_} ->  ok;
+	{ok,Mod,_} ->  ok;
 	Other -> throw({error,Other})
     end.