From 6dd2d47261b8e2ee4f324b607e43b7bf625bcebe Mon Sep 17 00:00:00 2001
From: Thibault Martin <thi.martin.pro@pm.me>
Date: Thu, 30 Nov 2023 11:33:06 +0100
Subject: [PATCH] [Variadic] Check name availability before creating new
functions
---
src/plugins/variadic/standard.ml | 33 ++++++++++++++++++++-----------
src/plugins/variadic/standard.mli | 1 +
src/plugins/variadic/translate.ml | 2 +-
3 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/plugins/variadic/standard.ml b/src/plugins/variadic/standard.ml
index ae07bb0df4e..366a587f94f 100644
--- a/src/plugins/variadic/standard.ml
+++ b/src/plugins/variadic/standard.ml
@@ -173,23 +173,34 @@ let match_call ~builder new_callee new_tparams args =
Build.(List.iter pure (of_exp_list unused_args));
Build.(translated_call (var new_callee) (of_exp_list new_args))
+
+let check_available_name env name =
+ not @@ Environment.mem_global env name
+ && not @@ Environment.mem_function env name
+
+let get_next_name env id name =
+ let rec aux id =
+ let next_name = name ^ (string_of_int id) in
+ if check_available_name env next_name then
+ next_name, id
+ else
+ aux (id + 1)
+ in
+ aux id
+
(* ************************************************************************ *)
(* Fallback calls *)
(* ************************************************************************ *)
-let fallback_fun_call ~builder ~callee vf args =
+let fallback_fun_call ~builder ~callee env vf args =
let module Build = (val builder : Builder.S) in
(* Choose function name *)
let name = callee.vname in
let vorig_name = callee.vorig_name in
- let count =
- try Fallback_counts.find name
- with Not_found -> 0
- in
- let count = count + 1 in
- Fallback_counts.replace name count;
- let new_name = name ^ "_fallback_" ^ (string_of_int count) in
+ let count = try Fallback_counts.find name + 1 with Not_found -> 1 in
+ let new_name, new_count = get_next_name env count (name ^ "_fallback_") in
+ Fallback_counts.replace name new_count;
(* Start building the function *)
let loc = vf.vf_decl.vdecl in
@@ -431,15 +442,15 @@ let valid_read_nstring typ =
let format_length typ =
find_predicate_by_width typ "format_length" "wformat_length"
-
let build_specialized_fun ~builder env vf format_fun tvparams =
let open Format_types in
let module Build = (val builder : Builder.S) in
(* Choose function name *)
let name = vf.vf_decl.vorig_name in
- vf.vf_specialization_count <- vf.vf_specialization_count + 1;
- let new_name = name ^ "_va_" ^ (string_of_int vf.vf_specialization_count) in
+ let id = vf.vf_specialization_count + 1 in
+ let new_name, new_count = get_next_name env id (name ^ "_va_") in
+ vf.vf_specialization_count <- new_count;
(* Start building the function *)
let loc = vf.vf_decl.vdecl in
diff --git a/src/plugins/variadic/standard.mli b/src/plugins/variadic/standard.mli
index d06853851d9..f7350aa4a11 100644
--- a/src/plugins/variadic/standard.mli
+++ b/src/plugins/variadic/standard.mli
@@ -24,6 +24,7 @@ exception Translate_call_exn of Cil_types.varinfo
val fallback_fun_call :
builder:Builder.t -> callee:Cil_types.varinfo ->
+ Environment.t ->
Va_types.variadic_function -> Cil_types.exp list -> unit
val aggregator_call :
diff --git a/src/plugins/variadic/translate.ml b/src/plugins/variadic/translate.ml
index 21489606b07..95778a48f08 100644
--- a/src/plugins/variadic/translate.ml
+++ b/src/plugins/variadic/translate.ml
@@ -200,7 +200,7 @@ let translate_variadics (file : file) =
try
f ~builder args
with Standard.Translate_call_exn callee ->
- Standard.fallback_fun_call ~callee ~builder vf args
+ Standard.fallback_fun_call ~callee ~builder env vf args
in
match vf.vf_class with
| Overload o -> cover_failure (Standard.overloaded_call o vf)
--
GitLab