aboutsummaryrefslogtreecommitdiffstats
path: root/cparser
diff options
context:
space:
mode:
authorBernhard Schommer <bernhardschommer@gmail.com>2016-08-23 08:29:18 +0200
committerBernhard Schommer <bernhardschommer@gmail.com>2016-08-23 08:29:18 +0200
commitfbac3359c99391e470ae4aae6993a7e67234f704 (patch)
tree8baf40d368afff47720e33d761e96d301a145e86 /cparser
parentc64c4ab2526ad87a3506c9e1fdf31fa1446c16eb (diff)
downloadcompcert-fbac3359c99391e470ae4aae6993a7e67234f704.tar.gz
compcert-fbac3359c99391e470ae4aae6993a7e67234f704.zip
Revert "Reuse env from during parameter elaboration."
This reverts commit c64c4ab2526ad87a3506c9e1fdf31fa1446c16eb.
Diffstat (limited to 'cparser')
-rw-r--r--cparser/Elab.ml8
1 files changed, 4 insertions, 4 deletions
diff --git a/cparser/Elab.ml b/cparser/Elab.ml
index d04d5638..76a7379c 100644
--- a/cparser/Elab.ml
+++ b/cparser/Elab.ml
@@ -640,7 +640,7 @@ and elab_type_declarator loc env ty kr_ok = function
error loc "Illegal function return type@ %a" Cprint.typ ty
| _ -> ()
end;
- let params',env = elab_parameters env params in
+ let params' = elab_parameters env params in
elab_type_declarator loc env (TFun(ty, Some params', vararg, [])) kr_ok d
| Cabs.PROTO_OLD(d, params) ->
begin match unroll env ty with
@@ -660,11 +660,11 @@ and elab_type_declarator loc env ty kr_ok = function
and elab_parameters env params =
(* Prototype introduces a new scope *)
- let (vars, env) = mmap elab_parameter (Env.new_scope env) params in
+ let (vars, _) = mmap elab_parameter (Env.new_scope env) params in
(* Catch special case f(t) where t is void or a typedef to void *)
match vars with
- | [ ( {C.name=""}, t) ] when is_void_type env t -> [],env
- | _ -> vars,env
+ | [ ( {C.name=""}, t) ] when is_void_type env t -> []
+ | _ -> vars
(* Elaboration of a function parameter *)