diff options
| author | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2013-10-16 09:50:38 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2013-10-16 09:50:38 +0000 |
| commit | c857f0b02463f4b0bc8100434eecdd46ce2ecbd1 (patch) | |
| tree | 4496e88a95bac87525f6422274a8b5dafc4c356b /backend/CMtypecheck.ml | |
| parent | 32b9fdc4332a6af5d108a0468399661867f4d2b4 (diff) | |
| download | compcert-c857f0b02463f4b0bc8100434eecdd46ce2ecbd1.tar.gz compcert-c857f0b02463f4b0bc8100434eecdd46ce2ecbd1.zip | |
Cminor parsing and printing (from Andrew Tolmach)
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2345 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'backend/CMtypecheck.ml')
| -rw-r--r-- | backend/CMtypecheck.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/CMtypecheck.ml b/backend/CMtypecheck.ml index f78f4705..d0bccca0 100644 --- a/backend/CMtypecheck.ml +++ b/backend/CMtypecheck.ml @@ -39,7 +39,7 @@ let ty_of_typ = function | Tint -> tint | Tfloat -> tfloat | Tlong -> tlong - | Tsingle -> tsingle + | Tsingle -> tfloat (* should be tsingle when supported *) let ty_of_sig_args tyl = List.map ty_of_typ tyl @@ -56,7 +56,7 @@ let unify t1 t2 = (name_of_type b1) (name_of_type b2))) | Base b, Var r -> r := Some (Base b) | Var r, Base b -> r := Some (Base b) - | Var r1, Var r2 -> r1 := Some (Var r2) + | Var r1, Var r2 -> if r1 != r2 then r1 := Some (Var r2) let unify_list l1 l2 = let ll1 = List.length l1 and ll2 = List.length l2 in |