1 files changed, 43 insertions, 19 deletions

diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 47b8dc766a..67661130a5 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -209,6 +209,7 @@
 	 type_is_defined/4,
 	 record_field_diffs_to_string/2,
 	 subst_all_vars_to_any/1,
+         subst_all_remote/2,
 	 lift_list_to_pos_empty/1,
          is_opaque_type/2,
 	 is_erl_type/1,
@@ -2985,16 +2986,19 @@ inf_union(U1, U2, Opaques) ->
         List = [A,B,F,I,L,N,T,M,Map],
         inf_union_collect(List, Opaque, InfFun, [], [])
     end,
-  O1 = OpaqueFun(U1, U2, fun(E, Opaque) -> t_inf(Opaque, E, Opaques) end),
-  O2 = OpaqueFun(U2, U1, fun(E, Opaque) -> t_inf(E, Opaque, Opaques) end),
-  Union = inf_union(U1, U2, 0, [], Opaques),
-  t_sup([O1, O2, Union]).
+  {O1, ThrowList1} =
+    OpaqueFun(U1, U2, fun(E, Opaque) -> t_inf(Opaque, E, Opaques) end),
+  {O2, ThrowList2}
+    = OpaqueFun(U2, U1, fun(E, Opaque) -> t_inf(E, Opaque, Opaques) end),
+  {Union, ThrowList3} = inf_union(U1, U2, 0, [], [], Opaques),
+  ThrowList = lists:merge3(ThrowList1, ThrowList2, ThrowList3),
+  case t_sup([O1, O2, Union]) of
+    ?none when ThrowList =/= [] -> throw(hd(ThrowList));
+    Sup -> Sup
+  end.
 
 inf_union_collect([], _Opaque, _InfFun, InfList, ThrowList) ->
-  case t_sup(InfList) of
-    ?none when ThrowList =/= [] -> throw(hd(lists:flatten(ThrowList)));
-    Sup -> Sup
-  end;
+  {t_sup(InfList), lists:usort(ThrowList)};
 inf_union_collect([?none|L], Opaque, InfFun, InfList, ThrowList) ->
   inf_union_collect(L, Opaque, InfFun, [?none|InfList], ThrowList);
 inf_union_collect([E|L], Opaque, InfFun, InfList, ThrowList) ->
@@ -3005,19 +3009,21 @@ inf_union_collect([E|L], Opaque, InfFun, InfList, ThrowList) ->
       inf_union_collect(L, Opaque, InfFun, InfList, [N|ThrowList])
   end.
 
-inf_union([?none|Left1], [?none|Left2], N, Acc, Opaques) ->
-  inf_union(Left1, Left2, N, [?none|Acc], Opaques);
-inf_union([T1|Left1], [T2|Left2], N, Acc, Opaques) ->
-  case t_inf(T1, T2, Opaques) of
-    ?none -> inf_union(Left1, Left2, N, [?none|Acc], Opaques);
-    T     -> inf_union(Left1, Left2, N+1, [T|Acc], Opaques)
+inf_union([?none|Left1], [?none|Left2], N, Acc, ThrowList, Opaques) ->
+  inf_union(Left1, Left2, N, [?none|Acc], ThrowList, Opaques);
+inf_union([T1|Left1], [T2|Left2], N, Acc, ThrowList, Opaques) ->
+  try t_inf(T1, T2, Opaques) of
+    ?none -> inf_union(Left1, Left2, N, [?none|Acc], ThrowList, Opaques);
+    T     -> inf_union(Left1, Left2, N+1, [T|Acc], ThrowList, Opaques)
+  catch throw:N when is_integer(N) ->
+      inf_union(Left1, Left2, N, [?none|Acc], [N|ThrowList], Opaques)
   end;
-inf_union([], [], N, Acc, _Opaques) ->
-  if N =:= 0 -> ?none;
+inf_union([], [], N, Acc, ThrowList, _Opaques) ->
+  if N =:= 0 -> {?none, ThrowList};
      N =:= 1 ->
       [Type] = [T || T <- Acc, T =/= ?none],
-      Type;
-     N >= 2  -> ?union(lists:reverse(Acc))
+      {Type, ThrowList};
+     N >= 2  -> {?union(lists:reverse(Acc)), ThrowList}
   end.
 
 inf_bitstr(U1, B1, U2, B2) ->
@@ -3156,6 +3162,18 @@ t_subst_aux(?union(List), VarMap) ->
 t_subst_aux(T, _VarMap) ->
   T.
 	      
+-spec subst_all_remote(erl_type(), erl_type()) -> erl_type().
+
+subst_all_remote(Type0, Substitute) ->
+  Map =
+    fun(Type) ->
+        case erl_types:t_is_remote(Type) of
+          true -> Substitute;
+          false -> Type
+        end
+    end,
+  erl_types:t_map(Map, Type0).
+
 %%-----------------------------------------------------------------------------
 %% Unification
 %%
@@ -4469,7 +4487,9 @@ get_mod_record([{FieldName, DeclType}|Left1],
 	       [{FieldName, ModType}|Left2], Acc) ->
   ModTypeNoVars = subst_all_vars_to_any(ModType),
   case
-    t_is_remote(ModTypeNoVars) orelse t_is_subtype(ModTypeNoVars, DeclType)
+    contains_remote(ModTypeNoVars)
+    orelse contains_remote(DeclType)
+    orelse t_is_subtype(ModTypeNoVars, DeclType)
   of
     false -> {error, FieldName};
     true -> get_mod_record(Left1, Left2, [{FieldName, ModType}|Acc])
@@ -4483,6 +4503,10 @@ get_mod_record(DeclFields, [], Acc) ->
 get_mod_record(_, [{FieldName2, _ModType}|_], _Acc) ->
   {error, FieldName2}.
 
+contains_remote(Type) ->
+  TypeNoRemote = subst_all_remote(Type, t_none()),
+  not t_is_equal(Type, TypeNoRemote).
+
 fields_from_form([], _TypeNames, _RecDict, _VarDict) ->
   {[], []};
 fields_from_form([{Name, Type}|Tail], TypeNames, RecDict,