Merge branch 'hb/record_field_undefined_type/OTP-9147' into dev

* hb/record_field_undefined_type/OTP-9147:
  Fix a bug concerning record field types

2 files changed, 10 insertions, 10 deletions

diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index bb4b18cf9b..15b45d72f4 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -757,7 +757,8 @@ record_fields([{typed,Expr,TypeInfo}|Fields]) ->
 	    {atom, La, _} ->
                 case has_undefined(TypeInfo) of
                     false ->
-                        lift_unions(abstract(undefined, La), TypeInfo);
+                        TypeInfo2 = maybe_add_paren(TypeInfo),
+                        lift_unions(abstract(undefined, La), TypeInfo2);
                     true ->
                         TypeInfo
                 end
@@ -778,6 +779,11 @@ has_undefined({type,_,union,Ts}) ->
 has_undefined(_) ->
     false.
 
+maybe_add_paren({ann_type,L,T}) ->
+    {paren_type,L,[{ann_type,L,T}]};
+maybe_add_paren(T) ->
+    T.
+
 term(Expr) ->
     try normalise(Expr)
     catch _:_R -> ret_err(?line(Expr), "bad attribute")
diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl
index df4a20b833..66c80a45cb 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -558,17 +558,11 @@ record_field({typed_record_field,{record_field,_,F,Val},Type}, Hook) ->
     Fl = lexpr(F, L, Hook),
     Vl = typed(lexpr(Val, R, Hook), Type),
     {list,[{cstep,[Fl,' ='],Vl}]};
-record_field({typed_record_field,Field,Type0}, Hook) ->
-    Type = remove_undefined(Type0),
+record_field({typed_record_field,Field,Type}, Hook) ->
     typed(record_field(Field, Hook), Type);
 record_field({record_field,_,F}, Hook) ->
     lexpr(F, 0, Hook).
 
-remove_undefined({type,L,union,[{atom,_,undefined}|T]}) ->
-    {type,L,union,T};
-remove_undefined(T) -> % cannot happen
-    T.
-
 list({cons,_,H,T}, Es, Hook) ->
     list(T, [H|Es], Hook);
 list({nil,_}, Es, Hook) ->