aboutsummaryrefslogtreecommitdiffstats
path: root/lib/hipe
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2014-05-26 08:56:05 +0200
committerHans Bolinder <[email protected]>2014-05-26 08:56:05 +0200
commit11540c517b082ee9be131d9cc96b24a4a5d4c7c8 (patch)
tree1feafe787add90cc918404ce136ac9de56ebce02 /lib/hipe
parente6c124ad7515f4b50cca8bd7ba4744ec8c1ef09c (diff)
parent21af711057b5369e54d8eabf2f63eda734f5f259 (diff)
downloadotp-11540c517b082ee9be131d9cc96b24a4a5d4c7c8.tar.gz
otp-11540c517b082ee9be131d9cc96b24a4a5d4c7c8.tar.bz2
otp-11540c517b082ee9be131d9cc96b24a4a5d4c7c8.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.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index e9e2fd757f..ba55cb0aba 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -4373,7 +4373,9 @@ get_mod_record([{FieldName, DeclType}|Left1],
[{FieldName, ModType}|Left2], Acc) ->
ModTypeNoVars = subst_all_vars_to_any(ModType),
case
- contains_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])