Remove opaque declarations from the attributes

-opaque declarations should not be retained in the attributes
(because they will be loaded along with the code and are not
useful).

While at it, filter away those Dialyzer attributes as early
as possible - in v3_kernel.

3 files changed, 25 insertions, 10 deletions

diff --git a/lib/compiler/src/beam_asm.erl b/lib/compiler/src/beam_asm.erl
index 497c4fa07b..d5ad019013 100644
--- a/lib/compiler/src/beam_asm.erl
+++ b/lib/compiler/src/beam_asm.erl
@@ -23,7 +23,7 @@
 -export([module/4]).
 -export([encode/2]).
 
--import(lists, [map/2,member/2,keymember/3,duplicate/2,filter/2]).
+-import(lists, [map/2,member/2,keymember/3,duplicate/2]).
 -include("beam_opcodes.hrl").
 
 module(Code, Abst, SourceFile, Opts) ->
@@ -191,11 +191,7 @@ flatten_exports(Exps) ->
 flatten_imports(Imps) ->
     list_to_binary(map(fun({M,F,A}) -> <<M:32,F:32,A:32>> end, Imps)).
 
-build_attributes(Opts, SourceFile, Attr0, Essentials) ->
-    Attr = filter(fun({type,_}) -> false;
-		     ({spec,_}) -> false;
-		     (_) -> true
-		  end, Attr0),
+build_attributes(Opts, SourceFile, Attr, Essentials) ->
     Misc = case member(slim, Opts) of
 	       false ->
 		   {{Y,Mo,D},{H,Mi,S}} = erlang:universaltime(),
diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl
index 974c64a8bc..fbe4d8617e 100644
--- a/lib/compiler/src/v3_kernel.erl
+++ b/lib/compiler/src/v3_kernel.erl
@@ -128,14 +128,27 @@ copy_anno(Kdst, Ksrc) ->
 	{'ok', #k_mdef{}, [warning()]}.
 
 module(#c_module{anno=A,name=M,exports=Es,attrs=As,defs=Fs}, _Options) ->
+    Kas = attributes(As),
+    Kes = map(fun (#c_var{name={_,_}=Fname}) -> Fname end, Es),
     St0 = #kern{lit=dict:new()},
     {Kfs,St} = mapfoldl(fun function/2, St0, Fs),
-    Kes = map(fun (#c_var{name={_,_}=Fname}) -> Fname end, Es),
-    Kas = map(fun ({#c_literal{val=N},V}) ->
-		      {N,core_lib:literal_value(V)} end, As),
     {ok,#k_mdef{anno=A,name=M#c_literal.val,exports=Kes,attributes=Kas,
 		body=Kfs ++ St#kern.funs},lists:sort(St#kern.ws)}.
 
+attributes([{#c_literal{val=Name},Val}|As]) ->
+    case include_attribute(Name) of
+	false ->
+	    attributes(As);
+	true ->
+	    [{Name,core_lib:literal_value(Val)}|attributes(As)]
+    end;
+attributes([]) -> [].
+
+include_attribute(type) -> false;
+include_attribute(spec) -> false;
+include_attribute(opaque) -> false;
+include_attribute(_) -> true.
+
 function({#c_var{name={F,Arity}=FA},Body}, St0) ->
     try
 	St1 = St0#kern{func=FA,ff=undefined,vcount=0,fcount=0,ds=sets:new()},
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index c015af788b..793c53ac31 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -24,6 +24,10 @@
 	 
 -include("test_server.hrl").
 
+%% Include an opaque declaration to cover the stripping of
+%% opaque types from attributes in v3_kernel.
+-opaque misc_SUITE_test_cases() :: [atom()].
+
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = test_server:timetrap(?t:minutes(10)),
     [{watchdog,Dog}|Config].
@@ -33,6 +37,8 @@ fin_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
+-spec all(any()) -> misc_SUITE_test_cases().
+
 all(suite) ->
     test_lib:recompile(?MODULE),
     [tobias,empty_string,md5,silly_coverage,confused_literals,
@@ -92,7 +98,7 @@ md5_1(Beam) ->
 silly_coverage(Config) when is_list(Config) ->
     %% sys_core_fold, sys_core_setel, v3_kernel
     BadCoreErlang = {c_module,[],
-		     name,exports,attrs,
+		     name,[],[],
 		     [{{c_var,[],{foo,2}},seriously_bad_body}]},
     ?line expect_error(fun() -> sys_core_fold:module(BadCoreErlang, []) end),
     ?line expect_error(fun() -> sys_core_dsetel:module(BadCoreErlang, []) end),