Fix iterator equality check bug in ai.h

reuk · reuk · commit 8de0ea351b7b · 2017-11-24T18:09:23.000Z
diff --git a/src/analyses/ai.h b/src/analyses/ai.h
@@ -409,7 +409,9 @@ class ait:public ai_baset
   }
 
 protected:
-  typedef std::unordered_map<locationt, domainT, const_target_hash> state_mapt;
+  typedef std::
+    unordered_map<locationt, domainT, const_target_hash, pointee_address_equalt>
+      state_mapt;
   state_mapt state_map;
 
   // this one creates states, if need be
diff --git a/src/goto-programs/goto_program_template.h b/src/goto-programs/goto_program_template.h
@@ -810,4 +810,15 @@ struct const_target_hash_templatet
   { return t->location_number; }
 };
 
+/// Functor to check whether iterators from different collections point at the
+/// same object.
+struct pointee_address_equalt
+{
+  template <class A, class B>
+  bool operator()(const A &a, const B &b) const
+  {
+    return &(*a) == &(*b);
+  }
+};
+
 #endif // CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_TEMPLATE_H

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,9 @@ class ait:public ai_baset`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`protected:`
`412`		`- typedef std::unordered_map<locationt, domainT, const_target_hash> state_mapt;`
	`412`	`+ typedef std::`
	`413`	`+ unordered_map<locationt, domainT, const_target_hash, pointee_address_equalt>`
	`414`	`+ state_mapt;`
`413`	`415`	`state_mapt state_map;`
`414`	`416`
`415`	`417`	`// this one creates states, if need be`