diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2017-02-06 14:48:39 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2017-02-06 14:48:39 +0100 |
| commit | 4e5a1b59c1653b1429f0a6cf2075ab2e54a43533 (patch) | |
| tree | de0a7b8174768f1b2c55036dba59331ca96700c1 | |
| parent | 3270ee2b1946eb79204d61aaa095ea27db9c04f5 (diff) | |
| download | compcert-kvx-4e5a1b59c1653b1429f0a6cf2075ab2e54a43533.tar.gz compcert-kvx-4e5a1b59c1653b1429f0a6cf2075ab2e54a43533.zip | |
Removed shadowing open
| -rw-r--r-- | cparser/StructReturn.ml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cparser/StructReturn.ml b/cparser/StructReturn.ml index 04f0021a..11fa39ca 100644 --- a/cparser/StructReturn.ml +++ b/cparser/StructReturn.ml @@ -19,7 +19,7 @@ open Machine open Configuration -open !C +open C open Cutil open Transform @@ -252,7 +252,7 @@ and transf_funargs env = function | Param_ref_caller -> (id, TPtr(t', [])) :: args' | Param_flattened(n, sz, al) -> - list_map_n (fun _ -> (Env.fresh_ident id.name, uint)) n + list_map_n (fun _ -> (Env.fresh_ident id.C.name, uint)) n @ args' (* Expressions: transform calls + rewrite the types *) @@ -324,7 +324,7 @@ and transf_call env ctx opt_lhs fn args ty = | None -> e | Some lhs -> eassign lhs e in match fn with - | {edesc = EVar {name = "__builtin_va_arg"}} -> + | {edesc = EVar {C.name = "__builtin_va_arg"}} -> (* Do not transform the call in this case *) opt_eassign {edesc = ECall(fn, args'); etyp = ty} | _ -> @@ -525,8 +525,8 @@ let rec transf_funparams loc env params = actions, IdentMap.add x estarx subst) | Param_flattened(n, sz, al) -> - let y = new_temp ~name:x.name (ty_buffer n) in - let yparts = list_map_n (fun _ -> Env.fresh_ident x.name) n in + let y = new_temp ~name:x.C.name (ty_buffer n) in + let yparts = list_map_n (fun _ -> Env.fresh_ident x.C.name) n in let assign_part e p act = sseq loc (sassign loc e {edesc = EVar p; etyp = uint}) act in (List.map (fun p -> (p, uint)) yparts @ params', |