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:17:50 +0200 |
commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /backend/CMtypecheck.ml | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.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 -> |