diff options
| author | Henrik Nord <[email protected]> | 2012-05-08 14:34:35 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-05-08 14:34:40 +0200 |
| commit | 75dbcf3ce8cb63dea0d674b67cb5d3d64d250e2a (patch) | |
| tree | 34c2beb6e2b4eff4fc5c12ea12398f3d00fc1b70 /lib/hipe | |
| parent | bb1734e95a5f6a7315819c24bc1fdd799534c787 (diff) | |
| parent | 56e3930cf406228d1e946a38aa4e77c62e8badb3 (diff) | |
| download | otp-75dbcf3ce8cb63dea0d674b67cb5d3d64d250e2a.tar.gz otp-75dbcf3ce8cb63dea0d674b67cb5d3d64d250e2a.tar.bz2 otp-75dbcf3ce8cb63dea0d674b67cb5d3d64d250e2a.zip | |
Merge branch 'sa/dialyzer-contract-variables' into maint
* sa/dialyzer-contract-variables:
Correct handling of type names in contracts
Don't rewrite unchanged PLT
Fix crash related to contract checking
OTP-10083
Diffstat (limited to 'lib/hipe')
| -rw-r--r-- | lib/hipe/cerl/erl_types.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl index ceec31742e..1789fc79fa 100644 --- a/lib/hipe/cerl/erl_types.erl +++ b/lib/hipe/cerl/erl_types.erl @@ -2555,8 +2555,8 @@ t_subst_dict(?list(Contents, Termination, Size), Dict) -> ?nil -> ?list(NewContents, ?nil, Size); ?any -> ?list(NewContents, ?any, Size); Other -> - ?list(NewContents, NewTermination, _) = t_cons(NewContents, Other), - ?list(NewContents, NewTermination, Size) + ?list(NewContents2, NewTermination, _) = t_cons(NewContents, Other), + ?list(NewContents2, NewTermination, Size) end end; t_subst_dict(?function(Domain, Range), Dict) -> @@ -2597,8 +2597,8 @@ t_subst_aux(?list(Contents, Termination, Size), VarMap) -> ?nil -> ?list(NewContents, ?nil, Size); ?any -> ?list(NewContents, ?any, Size); Other -> - ?list(NewContents, NewTermination, _) = t_cons(NewContents, Other), - ?list(NewContents, NewTermination, Size) + ?list(NewContents2, NewTermination, _) = t_cons(NewContents, Other), + ?list(NewContents2, NewTermination, Size) end end; t_subst_aux(?function(Domain, Range), VarMap) -> @@ -3186,8 +3186,8 @@ t_abstract_records(?list(Contents, Termination, Size), RecDict) -> ?nil -> ?list(NewContents, ?nil, Size); ?any -> ?list(NewContents, ?any, Size); Other -> - ?list(NewContents, NewTermination, _) = t_cons(NewContents, Other), - ?list(NewContents, NewTermination, Size) + ?list(NewContents2, NewTermination, _) = t_cons(NewContents, Other), + ?list(NewContents2, NewTermination, Size) end end; t_abstract_records(?function(Domain, Range), RecDict) -> |