diff options
| author | Hans Bolinder <[email protected]> | 2014-05-13 08:35:42 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2014-05-13 08:35:42 +0200 |
| commit | a21e69bc29d913a4f2d63abe1550a9ce97579e72 (patch) | |
| tree | e1ef545de03c734979cb0a149add9639b1ed1037 /lib/hipe | |
| parent | 614439de03d85efba23de0ea31f04cf8efb86495 (diff) | |
| parent | 1b0b2627bc16d75da311e4dd797356ff6c7f922d (diff) | |
| download | otp-a21e69bc29d913a4f2d63abe1550a9ce97579e72.tar.gz otp-a21e69bc29d913a4f2d63abe1550a9ce97579e72.tar.bz2 otp-a21e69bc29d913a4f2d63abe1550a9ce97579e72.zip | |
Merge branch 'maint'
* maint:
hipe: fix a bug concerning typed record fields
Diffstat (limited to 'lib/hipe')
| -rw-r--r-- | lib/hipe/cerl/erl_types.erl | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl index 939cc37ad6..e9e2fd757f 100644 --- a/lib/hipe/cerl/erl_types.erl +++ b/lib/hipe/cerl/erl_types.erl @@ -207,6 +207,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, @@ -3068,6 +3069,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 %% @@ -4360,7 +4373,7 @@ 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 t_is_subtype(ModTypeNoVars, DeclType) of false -> {error, FieldName}; true -> get_mod_record(Left1, Left2, [{FieldName, ModType}|Acc]) @@ -4374,6 +4387,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, |