a goal should be identified by a source_locationt

Signed-off-by: Lucas Cordeiro <[email protected]>

Author: lucasccordeiro

src/goto-instrument/cover.cpp

@@ -100,6 +100,18 @@ class basic_blockst
   }
 };
 
+bool coverage_goalst::is_existing_goal(source_locationt source_location)
+{
+  std::vector<std::string>::iterator it;
+  it = find (existing_goals.begin(), existing_goals.end(),
+		  source_location.get_line().c_str());
+
+  if(it == existing_goals.end())
+    return true;
+  else
+    return false;
+}
+
 const char *as_string(coverage_criteriont c)
 {
   switch(c)
@@ -934,7 +946,7 @@ void instrument_cover_goals(
             basic_blocks.source_location_map[block_nr];
 
           //check whether the current goal already exists
-          if(goals.is_existing_goal(source_location.get_line().c_str()) &&
+          if(goals.is_existing_goal(source_location) &&
              !source_location.get_file().empty() &&
              !source_location.is_built_in())
           {

src/goto-instrument/cover.h

@@ -23,7 +23,7 @@ class coverage_goalst
 {
 public:
   void set_goals(std::string goal);
-  bool is_existing_goal(const char* goal);
+  bool is_existing_goal(source_locationt source_location);
 
 private:
   std::vector<std::string> existing_goals;