aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-09-07 15:03:20 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-09-07 15:03:20 +0200
commit4fe35ac73e2ca7627f0880e8143a9230885930f0 (patch)
tree66315c74abfe027b02c22ed1cfe14ccf05521395
parentd020a475355d0b090b80c448adaae8f01628b5db (diff)
parent3798dc9b200fc056d3df7dbc49f0dfce4ff28722 (diff)
downloadotp-4fe35ac73e2ca7627f0880e8143a9230885930f0.tar.gz
otp-4fe35ac73e2ca7627f0880e8143a9230885930f0.tar.bz2
otp-4fe35ac73e2ca7627f0880e8143a9230885930f0.zip
Merge branch 'egil/hipe/fix-match-order-opaque-types/OTP-13876' into maint
* egil/hipe/fix-match-order-opaque-types/OTP-13876: hipe: Fix erl_types opaque match order
-rw-r--r--lib/hipe/cerl/erl_types.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index c9dd1051f3..326414b532 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -494,9 +494,9 @@ t_contains_opaque(?function(Domain, Range), Opaques) ->
t_contains_opaque(Domain, Opaques)
orelse t_contains_opaque(Range, Opaques);
t_contains_opaque(?identifier(_Types), _Opaques) -> false;
-t_contains_opaque(?integer(_Types), _Opaques) -> false;
t_contains_opaque(?int_range(_From, _To), _Opaques) -> false;
t_contains_opaque(?int_set(_Set), _Opaques) -> false;
+t_contains_opaque(?integer(_Types), _Opaques) -> false;
t_contains_opaque(?list(Type, Tail, _), Opaques) ->
t_contains_opaque(Type, Opaques) orelse t_contains_opaque(Tail, Opaques);
t_contains_opaque(?map(_, _, _) = Map, Opaques) ->