diff options
| author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
|---|---|---|
| committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
| commit | 8b817cda643d180d43ab8c84809ca2d55c7dd3df (patch) | |
| tree | 812fe2f7ec68c03c5f0762f1266f383193bbfe92 /backend/CMtypecheck.ml | |
| parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
| parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
| download | compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.tar.gz compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.zip | |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'backend/CMtypecheck.ml')
| -rw-r--r-- | backend/CMtypecheck.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/CMtypecheck.ml b/backend/CMtypecheck.ml index aacbf86f..72bf9cb4 100644 --- a/backend/CMtypecheck.ml +++ b/backend/CMtypecheck.ml @@ -323,7 +323,7 @@ let rec type_stmt env blk ret s = | Sreturn (Some e) -> begin match ret with | None -> raise (Error "return with argument") - | Some tret -> + | Some tret -> begin try unify (type_expr env [] e) (ty_of_typ tret) with Error s -> |