From f2ab6d0950d69c6d8921e5fed46b70c731f3e3ba Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.oliveiramaroneze@cea.fr>
Date: Mon, 11 Mar 2019 14:52:15 +0100
Subject: [PATCH] [rmtmps] remove obsoleted code
---
src/kernel_internals/typing/rmtmps.ml | 34 ++-------------------------
1 file changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/kernel_internals/typing/rmtmps.ml b/src/kernel_internals/typing/rmtmps.ml
index 3ecc19e5a44..e22c8830104 100644
--- a/src/kernel_internals/typing/rmtmps.ml
+++ b/src/kernel_internals/typing/rmtmps.ml
@@ -774,35 +774,6 @@ end
*
*)
-
-(* regular expression matching names of uninteresting locals *)
-let uninteresting =
- let names = [
- (* Cil.makeTempVar *)
- "__cil_tmp";
-
- (* sm: I don't know where it comes from but these show up all over. *)
- (* this doesn't seem to do what I wanted.. *)
- "iter";
-
- (* various macros in glibc's <bits/string2.h> *)
- "__result";
- "__s"; "__s1"; "__s2";
- "__s1_len"; "__s2_len";
- "__retval"; "__len";
-
- (* various macros in glibc's <ctype.h> *)
- "__c"; "__res";
-
- (* We remove the __malloc variables *)
- ] in
-
- (* optional alpha renaming *)
- let alpha = "\\(___[0-9]+\\)?" in
-
- let pattern = "\\(" ^ (String.concat "\\|" names) ^ "\\)" ^ alpha ^ "$" in
- Str.regexp pattern
-
let label_removable = function
Label (_,_,user) -> not user
| Case _ | Default _ -> false
@@ -853,9 +824,8 @@ let removeUnmarked isRoot ast reachable_tbl =
(* along the way, record the interesting locals that were removed *)
let name = local.vname in
(Kernel.debug ~dkey "removing local: %s" name);
- if not (Str.string_match uninteresting name 0) then
- removedLocals :=
- (func.svar.vname ^ "::" ^ name) :: !removedLocals;
+ removedLocals :=
+ (func.svar.vname ^ "::" ^ name) :: !removedLocals;
false
end else true
in
--
GitLab