4 files changed, 50 insertions, 6 deletions

diff --git a/lib/compiler/test/bs_construct_SUITE.erl b/lib/compiler/test/bs_construct_SUITE.erl
index 31c7890f26..e8b30f44ce 100644
--- a/lib/compiler/test/bs_construct_SUITE.erl
+++ b/lib/compiler/test/bs_construct_SUITE.erl
@@ -468,6 +468,10 @@ opt(Config) when is_list(Config) ->
     ?line {'EXIT',_} = (catch <<<<23,56,0,2>>:64/float>>),
     ?line {'EXIT',_} = (catch <<<<23,56,0,2:7>>/binary>>),
 
+    %% Test constant propagation - there should be a warning.
+    BadSz = 2.5,
+    {'EXIT',_} = (catch <<<<N,56,0,2>>:BadSz/binary>>),
+
     case id(false) of
 	true -> ?line opt_dont_call_me();
 	false -> ok
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 512fa0e4ac..da53a6ba9c 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -25,7 +25,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 app_test/1,
-	 file_1/1, module_mismatch/1, big_file/1, outdir/1, 
+	 file_1/1, forms_2/1, module_mismatch/1, big_file/1, outdir/1,
 	 binary/1, makedep/1, cond_and_ifdef/1, listings/1, listings_big/1,
 	 other_output/1, package_forms/1, encrypted_abstr/1,
 	 bad_record_use1/1, bad_record_use2/1, strict_record/1,
@@ -42,7 +42,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [app_test, file_1, module_mismatch, big_file, outdir,
+    [app_test, file_1, forms_2, module_mismatch, big_file, outdir,
      binary, makedep, cond_and_ifdef, listings, listings_big,
      other_output, package_forms, encrypted_abstr,
      {group, bad_record_use}, strict_record,
@@ -76,6 +76,9 @@ app_test(Config) when is_list(Config) ->
 
 file_1(Config) when is_list(Config) ->
     ?line Dog = test_server:timetrap(test_server:minutes(5)),
+
+    process_flag(trap_exit, true),
+
     ?line {Simple, Target} = files(Config, "file_1"),
     ?line {ok, Cwd} = file:get_cwd(),
     ?line ok = file:set_cwd(filename:dirname(Target)),
@@ -102,9 +105,37 @@ file_1(Config) when is_list(Config) ->
     %% Cleanup.
     ?line ok = file:delete(Target),
     ?line ok = file:del_dir(filename:dirname(Target)),
+
+    %% There should not be any messages in the messages.
+    receive
+	Any ->
+	    ?t:fail({unexpected,Any})
+    after 10 ->
+	    ok
+    end,
+
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
+forms_2(Config) when is_list(Config) ->
+    Src = "/foo/bar",
+    AbsSrc = filename:absname(Src),
+    {ok,simple,Binary} = compile:forms([{attribute,1,module,simple}],
+				       [binary,{source,Src}]),
+    code:load_binary(simple, Src, Binary),
+    Info = simple:module_info(compile),
+
+    %% Test that the proper source is returned.
+    AbsSrc = proplists:get_value(source, Info),
+
+    %% Ensure that the options are not polluted with 'source'.
+    [] = proplists:get_value(options, Info),
+
+    %% Cleanup.
+    true = code:delete(simple),
+    false = code:purge(simple),
+    ok.
+
 module_mismatch(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
     ?line File = filename:join(DataDir, "wrong_module_name.erl"),
diff --git a/lib/compiler/test/guard_SUITE_data/guard_SUITE_tuple_size.S b/lib/compiler/test/guard_SUITE_data/guard_SUITE_tuple_size.S
index c0bf04ed8f..cffb792920 100644
--- a/lib/compiler/test/guard_SUITE_data/guard_SUITE_tuple_size.S
+++ b/lib/compiler/test/guard_SUITE_data/guard_SUITE_tuple_size.S
@@ -19,10 +19,10 @@
     {get_tuple_element,{x,0},1,{x,2}}.
     {get_tuple_element,{x,0},2,{x,3}}.
     {get_tuple_element,{x,0},3,{x,4}}.
-    {gc_bif,'+',{f,0},5,[{x,1},{x,2}],{x,0}}.
-    {gc_bif,'+',{f,0},5,[{x,0},{x,3}],{x,0}}.
-    {gc_bif,'+',{f,0},5,[{x,0},{x,4}],{x,0}}.
-    {gc_bif,'+',{f,0},5,[{x,0},{x,5}],{x,0}}.
+    {gc_bif,'+',{f,0},6,[{x,1},{x,2}],{x,0}}.
+    {gc_bif,'+',{f,0},6,[{x,0},{x,3}],{x,0}}.
+    {gc_bif,'+',{f,0},6,[{x,0},{x,4}],{x,0}}.
+    {gc_bif,'+',{f,0},6,[{x,0},{x,5}],{x,0}}.
     return.
   {label,3}.
     {badmatch,{x,0}}.
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index 5e13a93c52..b53d0dba1d 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -190,6 +190,15 @@ silly_coverage(Config) when is_list(Config) ->
 		     {label,2}|non_proper_list]}],99},
     ?line expect_error(fun() -> beam_block:module(BlockInput, []) end),
 
+    %% beam_type
+    TypeInput = {?MODULE,[{foo,0}],[],
+		   [{function,foo,0,2,
+		     [{label,1},
+		      {line,loc},
+		      {func_info,{atom,?MODULE},{atom,foo},0},
+		      {label,2}|non_proper_list]}],99},
+    expect_error(fun() -> beam_type:module(TypeInput, []) end),
+
     %% beam_except
     ExceptInput = {?MODULE,[{foo,0}],[],
 		   [{function,foo,0,2,