From c26401021cbc60005ecf65e109743884fafbd4d2 Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Mon, 6 Jul 2015 17:42:00 -0100
Subject: [PATCH] [infer] remove Sil.Avariadic_function_argument

Summary:
This attribute was used to tag arguments to variadic functions, as a way to
detect premature sentinels. The approach to detect premature sentinels has
changed making it obsolete.
---
 infer/src/backend/prop.ml  |  3 ---
 infer/src/backend/prop.mli |  3 ---
 infer/src/backend/sil.ml   | 15 ---------------
 infer/src/backend/sil.mli  |  4 ----
 4 files changed, 25 deletions(-)

diff --git a/infer/src/backend/prop.ml b/infer/src/backend/prop.ml
index 9495f906f..595fe4a84 100644
--- a/infer/src/backend/prop.ml
+++ b/infer/src/backend/prop.ml
@@ -1728,9 +1728,6 @@ let get_autorelease_attribute prop exp =
 let get_objc_null_attribute prop exp =
   get_attribute prop exp Sil.ACobjc_null
 
-let get_variadic_function_argument_attribute prop exp =
-  get_attribute prop exp Sil.ACvariadic_function_argument
-
 let get_div0_attribute prop exp =
   get_attribute prop exp Sil.ACdiv0
 
diff --git a/infer/src/backend/prop.mli b/infer/src/backend/prop.mli
index b922f31b8..d63949a91 100644
--- a/infer/src/backend/prop.mli
+++ b/infer/src/backend/prop.mli
@@ -282,9 +282,6 @@ val get_div0_attribute : 'a t -> exp -> attribute option
 (** Get the objc null attribute associated to the expression, if any *)
 val get_objc_null_attribute : 'a t -> exp -> attribute option
 
-(** Get the variadic function argument attribute associated to the expression, if any *)
-val get_variadic_function_argument_attribute : 'a t -> exp -> attribute option
-
 (** Get all the attributes of the prop *)
 val get_all_attributes : 'a t -> (exp * attribute) list
 
diff --git a/infer/src/backend/sil.ml b/infer/src/backend/sil.ml
index ee62e6301..03b4b2520 100644
--- a/infer/src/backend/sil.ml
+++ b/infer/src/backend/sil.ml
@@ -666,9 +666,6 @@ and attribute =
   | Auntaint
   | Adiv0 of path_pos (** value appeared in second argument of division in path position *)
   | Aobjc_null of exp (** the exp. is null because of a call to a method with exp as a null receiver *)
-  | Avariadic_function_argument of Procname.t * int * int
-  (** (pn, n, i) the exp. is used as [i]th argument of a call to the variadic function
-  [pn] that has [n] arguments *)
   | Aretval of Procname.t (** value was returned from a call to the given procedure *)
 
 (** Categories of attributes *)
@@ -678,7 +675,6 @@ and attribute_category =
   | ACtaint
   | ACdiv0
   | ACobjc_null
-  | ACvariadic_function_argument
 
 (** Constants *)
 and const =
@@ -1183,7 +1179,6 @@ let attribute_to_category att =
   | Aautorelease -> ACautorelease
   | Adiv0 _ -> ACdiv0
   | Aobjc_null _ -> ACobjc_null
-  | Avariadic_function_argument _ -> ACvariadic_function_argument
 
 let cname_opt_compare nameo1 nameo2 = match nameo1, nameo2 with
   | None, None -> 0
@@ -1416,12 +1411,6 @@ and attribute_compare (att1 : attribute) (att2 : attribute) : int =
       exp_compare exp1 exp2
   | Aobjc_null _, _ -> -1
   | _, Aobjc_null _ -> 1
-  | Avariadic_function_argument (pn1, n1, i1), Avariadic_function_argument (pn2, n2, i2) ->
-      Procname.compare pn1 pn2
-      |> next int_compare n1 n2
-      |> next int_compare i1 i2
-  | Avariadic_function_argument _, _ -> -1
-  | _, Avariadic_function_argument _ -> 1
   | Aretval pn1, Aretval pn2 -> Procname.compare pn1 pn2
   | Aretval _, _ -> -1
   | _, Aretval _ -> 1
@@ -2006,10 +1995,6 @@ and attribute_to_string pe = function
         | Lfield _ -> "FIELD "^(exp_to_string exp)
         | _ -> "" in
       "OBJC_NULL["^ info_s ^"]"
-  | Avariadic_function_argument (pn, n, i) ->
-      Printf.sprintf "VA_ARG" ^ (str_binop pe Lt)
-      ^ Procname.to_string pn ^ "," ^ (string_of_int n) ^ "," ^ (string_of_int i)
-      ^ (str_binop pe Gt)
   | Aretval pn -> "RET" ^ str_binop pe Lt ^ Procname.to_string pn ^ str_binop pe Gt
 
 and pp_const pe f = function
diff --git a/infer/src/backend/sil.mli b/infer/src/backend/sil.mli
index 36c147861..5ea87cfc9 100644
--- a/infer/src/backend/sil.mli
+++ b/infer/src/backend/sil.mli
@@ -288,9 +288,6 @@ and attribute =
   | Auntaint
   | Adiv0 of path_pos (** value appeared in second argument of division at given path position *)
   | Aobjc_null of exp (** the exp. is null because of a call to a method with exp as a null receiver *)
-  | Avariadic_function_argument of Procname.t * int * int (** (pn, n, i) the exp. is used as [i]th
-  argument of a call to the variadic
-  function [pn] that has [n] arguments *)
   | Aretval of Procname.t (** value was returned from a call to the given procedure *)
 
 (** Categories of attributes *)
@@ -300,7 +297,6 @@ and attribute_category =
   | ACtaint
   | ACdiv0
   | ACobjc_null
-  | ACvariadic_function_argument
 
 (** Constants *)
 and const =