[infer][biabduction] no longer exchange the expressions associated to an attribute

Summary: It is not clear to me what the removed code was for in the first place. Basically, it was replacing the pure part of propositions in a semantically equivalent way, e.g. replacing `a = b /\ Attribute(a)` to `a = b /\ Attribute(b)`, and  `a = b /\ Attribute(b)` to `a = b /\ Attribute(a)`.

Reviewed By: jberdine

Differential Revision: D5657366

fbshipit-source-id: 93cd9e0

infer/src/backend/Attribute.ml

@@ -29,24 +29,23 @@ let attributes_in_same_category attr1 attr2 =
   PredSymb.equal_category cat1 cat2
 
 (** Replace an attribute associated to the expression *)
-let add_or_replace_check_changed tenv check_attribute_change prop atom0 =
+let add_or_replace_check_changed tenv check_attribute_change prop atom =
-  match atom0 with
+  match atom with
   | Sil.Apred (att0, (_ :: _ as exps0)) | Anpred (att0, (_ :: _ as exps0))
    -> let pairs = List.map ~f:(fun e -> (e, Prop.exp_normalize_prop tenv prop e)) exps0 in
       let _, nexp = List.hd_exn pairs in
       (* len exps0 > 0 by match *)
-      let natom = Sil.atom_replace_exp pairs atom0 in
       let atom_map = function
         | Sil.Apred (att, exp :: _)
         | Anpred (att, exp :: _)
           when Exp.equal nexp exp && attributes_in_same_category att att0
-         -> check_attribute_change att att0 ; natom
+         -> check_attribute_change att att0 ; atom
-        | atom
+        | atom'
-         -> atom
+         -> atom'
       in
       let pi = prop.Prop.pi in
       let pi' = IList.map_changed atom_map pi in
-      if phys_equal pi pi' then Prop.prop_atom_and tenv prop natom
+      if phys_equal pi pi' then Prop.prop_atom_and tenv prop atom
       else Prop.normalize tenv (Prop.set prop ~pi:pi')
   | _
    -> prop