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 /cparser/Cleanup.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 'cparser/Cleanup.ml')
-rw-r--r-- | cparser/Cleanup.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cparser/Cleanup.ml b/cparser/Cleanup.ml index c81fd498..c8a900d5 100644 --- a/cparser/Cleanup.ml +++ b/cparser/Cleanup.ml @@ -92,7 +92,7 @@ let rec add_stmt s = | Sbreak -> () | Scontinue -> () | Sswitch(e, s1) -> add_exp e; add_stmt s1 - | Slabeled(lbl, s) -> + | Slabeled(lbl, s) -> begin match lbl with Scase e -> add_exp e | _ -> () end; add_stmt s | Sgoto lbl -> () @@ -187,7 +187,7 @@ let saturate p = let remove_unused_debug = function | Gdecl (_,id,_,_) -> Debug.remove_unused id | Gfundef f -> Debug.remove_unused f.fd_name - | _ -> () + | _ -> () let rec simpl_globdecls accu = function | [] -> accu @@ -212,6 +212,6 @@ let program p = let p' = simpl_globdecls [] p in referenced := IdentSet.empty; p' - + |