suppr: Support has_data_member and has_data_member_regexp properties

In the [supress_type] directive, this patch adds support for two new
properties:

* has_data_data_member = {foo, bar, blah}
  Suppresses change reports involving a type which has data members
  with names specified by the value of this property.

* has_data_member_regexp = some-regexp
  Suppresses change reports involving a type which has data members
  with names specified by the regular expression given as a value of
  this property.

	* include/abg-fwd.h (string_set_type): Define new typedef.
	* src/abg-suppression-priv.h
	* include/abg-suppression.h
	(type_suppression::{get,set}_potential_data_member_names[_regex_str]):
	Declare new data member.
	(type_suppression::priv::{potential_data_members_,
	potential_data_members_regex_str_,
	potential_data_members_regex_}): Define new data members.
	(type_suppression::priv::{get,set}_potential_data_member_names_regex):
	Define new member functions.
	* src/abg-suppression.cc
	(type_suppression::{get,set}_potential_data_member_names): Define new
	member functions.
	(type_suppression::{get,set}_potential_data_member_names_regex_str):
	Likewise.
	(type_suppression::suppresses_diff): Implement suppression using
	the new "has_data_member" and "has_data_member_regexp" properties.
	(read_type_suppression): Support parsing the new "has_data_member"
	and "has_data_member_regexp" properties of the type suppression
	directive.
	* tests/data/test-diff-suppr/has-data-member-[1-7].suppr: New
	suppression specifications for test purposes.
	* tests/data/test-diff-suppr/test-has-data-member-output-{1,2}.txt:
	New reference test outputs.
	* tests/data/test-diff-suppr/test-has-data-member-v{0,1}.cc:
	Source code of new input binary tests.
	* tests/data/test-diff-suppr/test-has-data-member-v{0,1}.o: New
	binary test inputs.
	* tests/data/Makefile.am: Add the test inputs below to source
	distribution.
	* tests/test-diff-suppr.cc (in_out_specs): Add the new test inputs
	above to this test harness.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>

diff --git a/doc/manuals/libabigail-concepts.rst b/doc/manuals/libabigail-concepts.rst
index c30e87e87c9e93af14cd4149106ac5c396dc46d2..2824b216cfdeedc9cbcd6f5ef8858237e2d3aabf 100644 (file)
--- a/doc/manuals/libabigail-concepts.rst
+++ b/doc/manuals/libabigail-concepts.rst
@@ -423,6 +423,54 @@ The potential properties of this sections are listed below:
  defined in header files whose path match the regular expression
  provided a value of the property.
 
+ .. _suppr_has_data_member_label:
+
+* ``has_data_member``
+
+  Usage:
+
+    ``has_data_member`` ``=`` <``list-of-data-member-names``>
+
+Suppresses change reports involving a type which contains data members
+whose names are provided in the list value of this property.
+
+A usage examples of this property would be: ::
+
+  has_data_member = {private_data_member0, private_data_member1}
+
+
+The property above would match any type which contains at least two
+data members whose names are ``private_data_member0`` and
+``private_data_member1``.
+
+Another usage examples of this property would be: ::
+
+  has_data_member = another_private_data_member
+
+The property above would match any type which contains
+a data member which name is ``another_private_data_member0``.
+
+ .. _suppr_has_data_member_regexp_label:
+
+* ``has_data_member_regexp``
+
+  Usage:
+
+    ``has_data_member_regexp`` ``=`` <``a-regular-expression``>
+
+Suppresses change reports involving a type which contains data members
+whose names match the regular expression provided as the value of this
+property.
+
+A usage examples of this property would be: ::
+
+  has_data_member_regexp = ^private_data_member
+
+The property above would match any type which contains data members
+whose names match the regular expression ``^private_data_member``.  In
+other words, it would match any type which contains data members whose
+names start with the string "private_data_member".
+
  .. _suppr_has_data_member_inserted_at_label:
 
 * ``has_data_member_inserted_at``

diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index 96aeab54df57c07e3311055a6c747127766989af..155642f0960a2f0dc81eae49a12ed96c0062a66c 100644 (file)
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -17,6 +17,7 @@
 #include <string>
 #include <typeinfo>
 #include <unordered_map>
+#include <unordered_set>
 #include <utility> // for std::rel_ops, at least.
 #include <vector>
 #include "abg-interned-str.h"
@@ -54,6 +55,9 @@ using std::weak_ptr;
 using std::unordered_map;
 using std::string;
 using std::vector;
+using std::unordered_set;
+
+typedef unordered_set<string> string_set_type;
 
 // Pull in relational operators.
 using namespace std::rel_ops;

diff --git a/include/abg-suppression.h b/include/abg-suppression.h
index 8e22e122d6154f984b9c3c2a673df3774e0584c8..27f52110836b7796c20fb6156d1e788f7096a183 100644 (file)
--- a/include/abg-suppression.h
+++ b/include/abg-suppression.h
@@ -243,6 +243,18 @@ public:
   void
   set_reach_kind(reach_kind k);
 
+  const string_set_type&
+  get_potential_data_member_names() const;
+
+  void
+  set_potential_data_member_names(const string_set_type&) const;
+
+  const string&
+  get_potential_data_member_names_regex_str() const;
+
+  void
+  set_potential_data_member_names_regex_str(const string&) const;
+
   void
   set_data_member_insertion_ranges(const insertion_ranges& r);
 

diff --git a/src/abg-suppression-priv.h b/src/abg-suppression-priv.h
index 4b74096dba6025ad8b24b4abeb780764eb35a3f1..5fc1ec52df1e64bf2a7aa1a23ef6df3792ffc39c 100644 (file)
--- a/src/abg-suppression-priv.h
+++ b/src/abg-suppression-priv.h
@@ -570,6 +570,15 @@ class type_suppression::priv
   type_suppression::type_kind          type_kind_;
   bool                                 consider_reach_kind_;
   type_suppression::reach_kind         reach_kind_;
+  // The data members a class needs to have to match this suppression
+  // specification.  These might be selected by a regular expression.
+  string_set_type                      potential_data_members_;
+  // The regular expression string that selects the potential data
+  // members of the class.
+  string                               potential_data_members_regex_str_;
+  // The compiled regular expression that selects the potential data
+  // members of the class.
+  mutable regex::regex_t_sptr          potential_data_members_regex_;
   type_suppression::insertion_ranges   insertion_ranges_;
   unordered_set<string>                        source_locations_to_keep_;
   string                               source_location_to_keep_regex_str_;
@@ -677,6 +686,34 @@ public:
   set_source_location_to_keep_regex(regex::regex_t_sptr r)
   {source_location_to_keep_regex_ = r;}
 
+  /// Getter for the "potential_data_member_names_regex" object.
+  ///
+  /// This regex object matches the names of the data members that are
+  /// needed for this suppression specification to select the type.
+  ///
+  /// @return the "potential_data_member_names_regex" object.
+  const regex::regex_t_sptr
+  get_potential_data_member_names_regex() const
+  {
+    if (!potential_data_members_regex_
+       && !potential_data_members_regex_str_.empty())
+      {
+       potential_data_members_regex_ =
+         regex::compile(potential_data_members_regex_str_);
+      }
+    return potential_data_members_regex_;
+  }
+
+  /// Setter for the "potential_data_member_names_regex" object.
+  ///
+  /// This regex object matches the names of the data members that are
+  /// needed for this suppression specification to select the type.
+  ///
+  /// @param r the new "potential_data_member_names_regex" object.
+  void
+  set_potential_data_member_names_regex(regex::regex_t_sptr &r)
+  {potential_data_members_regex_ = r;}
+
   friend class type_suppression;
 }; // class type_suppression::priv
 

diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc
index 059c3909f2b61bce949614ed53034ed476db9b88..5fcdef97b6d8dc7509d11c76126b10592a68489f 100644 (file)
--- a/src/abg-suppression.cc
+++ b/src/abg-suppression.cc
@@ -569,6 +569,38 @@ void
 type_suppression::set_reach_kind(reach_kind k)
 {priv_->reach_kind_ = k;}
 
+/// Getter of the "potential_data_member_names" property.
+///
+/// @return the set of potential data member names of this
+/// suppression.
+const unordered_set<string>&
+type_suppression::get_potential_data_member_names() const
+{return priv_->potential_data_members_;}
+
+/// Setter of the "potential_data_member_names" property.
+///
+/// @param s the new set of potential data member names of this
+/// suppression.
+void
+type_suppression::set_potential_data_member_names
+(const string_set_type& s) const
+{priv_->potential_data_members_ = s;}
+
+/// Getter of the "potential_data_member_names_regex" string.
+///
+/// @return the "potential_data_member_names_regex" string.
+const string&
+type_suppression::get_potential_data_member_names_regex_str() const
+{return priv_->potential_data_members_regex_str_;}
+
+/// Setter of the "potential_data_member_names_regex" string.
+///
+/// @param d the new "potential_data_member_names_regex" string.
+void
+type_suppression::set_potential_data_member_names_regex_str
+(const string& d) const
+{priv_->potential_data_members_regex_str_ = d;}
+
 /// Setter for the vector of data member insertion ranges that
 /// specifies where a data member is inserted as far as this
 /// suppression specification is concerned.
@@ -778,6 +810,43 @@ type_suppression::suppresses_diff(const diff* diff) const
   // Now let's consider class diffs in the context of a suppr spec
   // that contains properties like "has_data_member_inserted_*".
 
+  const class_or_union_diff* cou_diff = is_class_or_union_diff(d);
+  if (cou_diff)
+    {
+      class_or_union_sptr f = cou_diff->first_class_or_union();
+      // We are looking at the a class or union diff ...
+      if (!get_potential_data_member_names().empty())
+       {
+         // ... and the suppr spec has a:
+         //
+         //    "has_data_member = {foo, bar}" property
+         //
+         for (string var_name : get_potential_data_member_names())
+           if (!f->find_data_member(var_name))
+             return false;
+       }
+
+      if (!get_potential_data_member_names_regex_str().empty())
+       {
+         if (const regex_t_sptr& data_member_name_regex =
+             priv_->get_potential_data_member_names_regex())
+           {
+             bool data_member_matched = false;
+             for (var_decl_sptr dm : f->get_data_members())
+               {
+                 if (regex::match(data_member_name_regex, dm->get_name()))
+                   {
+                     data_member_matched = true;
+                     break;
+                   }
+               }
+             if (!data_member_matched)
+               return false;
+           }
+       }
+    }
+
+  // Evaluate has_data_member_inserted_*" clauses.
   const class_diff* klass_diff = dynamic_cast<const class_diff*>(d);
   if (klass_diff)
     {
@@ -1720,6 +1789,56 @@ read_type_suppression(const ini::config::section& section)
        read_suppression_reach_kind(reach_kind_prop->get_value()->as_string());
     }
 
+  // Support has_data_member = {}
+  string_set_type potential_data_member_names;
+  if (ini::property_sptr propertee = section.find_property("has_data_member"))
+    {
+      // This is either has_data_member = {foo, blah} or
+      // has_data_member = foo.
+      ini::tuple_property_value_sptr tv;
+      ini::string_property_value_sptr sv;
+      if (ini::tuple_property_sptr prop = is_tuple_property(propertee))
+       // Value is of the form {foo,blah}
+       tv = prop->get_value();
+      else if (ini::simple_property_sptr prop = is_simple_property(propertee))
+       // Value is of the form foo.
+       sv = prop->get_value();
+
+      // Ensure that the property value has the form {"foo", "blah", ...};
+      // Meaning it's a tuple of one element which is a list or a string.
+      if (tv
+         && tv->get_value_items().size() == 1
+         && (is_list_property_value(tv->get_value_items().front())
+             || is_string_property_value(tv->get_value_items().front())))
+       {
+         ini::list_property_value_sptr val =
+           is_list_property_value(tv->get_value_items().front());
+         if (!val)
+           {
+             // We have just one potential data member name,as a
+             // string_property_value.
+             string name =
+               is_string_property_value(tv->get_value_items().front())
+               ->as_string();
+             potential_data_member_names.insert(name);
+           }
+         else
+           for (const string& name : val->get_content())
+             potential_data_member_names.insert(name);
+       }
+      else if (sv)
+       {
+         string name = sv->as_string();
+         potential_data_member_names.insert(name);
+       }
+    }
+
+  // Support has_data_member_regexp = str
+  string potential_data_member_names_regexp_str;
+  if (ini::simple_property_sptr prop =
+      is_simple_property(section.find_property("has_data_member_regexp")))
+      potential_data_member_names_regexp_str = prop->get_value()->as_string();
+
   // Support has_data_member_inserted_at
   vector<type_suppression::insertion_range_sptr> insert_ranges;
   bool consider_data_member_insertion = false;
@@ -1919,6 +2038,13 @@ read_type_suppression(const ini::config::section& section)
       result->set_reach_kind(reach_kind);
     }
 
+  if (!potential_data_member_names.empty())
+    result->set_potential_data_member_names(potential_data_member_names);
+
+  if (!potential_data_member_names_regexp_str.empty())
+    result->set_potential_data_member_names_regex_str
+      (potential_data_member_names_regexp_str);
+
   if (consider_data_member_insertion)
     result->set_data_member_insertion_ranges(insert_ranges);
 

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 1a0a3fa461b9af87a2331ff099a9207e74e5aac5..57abf7a976168dc69cc0263e45b7fd77571da7b9 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -1740,6 +1740,19 @@ test-diff-suppr/PR28073/PR28073.before.o \
 test-diff-suppr/PR28073/PR28073.before.o.abi \
 test-diff-suppr/PR28073/PR28073.c \
 test-diff-suppr/PR28073/bitfield.suppr \
+test-diff-suppr/has-data-member-1.suppr \
+test-diff-suppr/has-data-member-2.suppr \
+test-diff-suppr/has-data-member-3.suppr \
+test-diff-suppr/has-data-member-4.suppr \
+test-diff-suppr/has-data-member-5.suppr \
+test-diff-suppr/has-data-member-6.suppr \
+test-diff-suppr/has-data-member-7.suppr \
+test-diff-suppr/test-has-data-member-output-1.txt \
+test-diff-suppr/test-has-data-member-output-2.txt \
+test-diff-suppr/test-has-data-member-v0.cc \
+test-diff-suppr/test-has-data-member-v0.o \
+test-diff-suppr/test-has-data-member-v1.cc \
+test-diff-suppr/test-has-data-member-v1.o \
 \
 test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1 \
 test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi \

diff --git a/tests/data/test-diff-suppr/has-data-member-1.suppr b/tests/data/test-diff-suppr/has-data-member-1.suppr
new file mode 100644 (file)
index 0000000..37c0d1e
--- /dev/null
+++ b/tests/data/test-diff-suppr/has-data-member-1.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = struct
+  has_data_member = {private_data_member0, private_data_member1}

diff --git a/tests/data/test-diff-suppr/has-data-member-2.suppr b/tests/data/test-diff-suppr/has-data-member-2.suppr
new file mode 100644 (file)
index 0000000..909fd01
--- /dev/null
+++ b/tests/data/test-diff-suppr/has-data-member-2.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = struct
+  has_data_member = {private_data_member0}

diff --git a/tests/data/test-diff-suppr/has-data-member-3.suppr b/tests/data/test-diff-suppr/has-data-member-3.suppr
new file mode 100644 (file)
index 0000000..43823d7
--- /dev/null
+++ b/tests/data/test-diff-suppr/has-data-member-3.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = struct
+  has_data_member = private_data_member1

diff --git a/tests/data/test-diff-suppr/has-data-member-4.suppr b/tests/data/test-diff-suppr/has-data-member-4.suppr
new file mode 100644 (file)
index 0000000..779a39f
--- /dev/null
+++ b/tests/data/test-diff-suppr/has-data-member-4.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = struct
+  has_data_member = {private_data_member3, private_data_member4}

diff --git a/tests/data/test-diff-suppr/has-data-member-5.suppr b/tests/data/test-diff-suppr/has-data-member-5.suppr
new file mode 100644 (file)
index 0000000..6ab8075
--- /dev/null
+++ b/tests/data/test-diff-suppr/has-data-member-5.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = struct
+  has_data_member = private_data_member5

diff --git a/tests/data/test-diff-suppr/has-data-member-6.suppr b/tests/data/test-diff-suppr/has-data-member-6.suppr
new file mode 100644 (file)
index 0000000..7bd3415
--- /dev/null
+++ b/tests/data/test-diff-suppr/has-data-member-6.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = struct
+  has_data_member_regexp = ^private_data_member

diff --git a/tests/data/test-diff-suppr/has-data-member-7.suppr b/tests/data/test-diff-suppr/has-data-member-7.suppr
new file mode 100644 (file)
index 0000000..03c9d99
--- /dev/null
+++ b/tests/data/test-diff-suppr/has-data-member-7.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = struct
+  has_data_member_regexp = ^private_data_memberWRONG

diff --git a/tests/data/test-diff-suppr/test-has-data-member-output-1.txt b/tests/data/test-diff-suppr/test-has-data-member-output-1.txt
new file mode 100644 (file)
index 0000000..2212998
--- /dev/null
+++ b/tests/data/test-diff-suppr/test-has-data-member-output-1.txt
@@ -0,0 +1,19 @@
+Functions changes summary: 0 Removed, 2 Changed, 0 Added functions
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
+2 functions with some indirect sub-type change:
+
+  [C] 'function int bar(S1*)' at test-has-data-member-v0.cc:19:1 has some indirect sub-type changes:
+    parameter 1 of type 'S1*' has sub-type changes:
+      in pointed to type 'struct S1' at test-has-data-member-v1.cc:8:1:
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char non_suppressed_added_member', at offset 32 (in bits) at test-has-data-member-v1.cc:11:1
+
+  [C] 'function void foo(S0&)' at test-has-data-member-v0.cc:14:1 has some indirect sub-type changes:
+    parameter 1 of type 'S0&' has sub-type changes:
+      in referenced type 'struct S0' at test-has-data-member-v1.cc:1:1:
+        type size changed from 64 to 96 (in bits)
+        1 data member insertion:
+          'int suppressed_added_member', at offset 64 (in bits) at test-has-data-member-v1.cc:5:1
+

diff --git a/tests/data/test-diff-suppr/test-has-data-member-output-2.txt b/tests/data/test-diff-suppr/test-has-data-member-output-2.txt
new file mode 100644 (file)
index 0000000..ab0110c
--- /dev/null
+++ b/tests/data/test-diff-suppr/test-has-data-member-output-2.txt
@@ -0,0 +1,12 @@
+Functions changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added functions
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
+1 function with some indirect sub-type change:
+
+  [C] 'function int bar(S1*)' at test-has-data-member-v0.cc:19:1 has some indirect sub-type changes:
+    parameter 1 of type 'S1*' has sub-type changes:
+      in pointed to type 'struct S1' at test-has-data-member-v1.cc:8:1:
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char non_suppressed_added_member', at offset 32 (in bits) at test-has-data-member-v1.cc:11:1
+

diff --git a/tests/data/test-diff-suppr/test-has-data-member-v0.cc b/tests/data/test-diff-suppr/test-has-data-member-v0.cc
new file mode 100644 (file)
index 0000000..554002c
--- /dev/null
+++ b/tests/data/test-diff-suppr/test-has-data-member-v0.cc
@@ -0,0 +1,22 @@
+struct S0
+{
+  int private_data_member0;
+  char private_data_member1;
+};
+
+struct S1
+{
+  int m0;
+};
+
+
+void
+foo(S0&)
+{
+}
+
+int
+bar(S1* s)
+{
+  return s->m0;
+}

diff --git a/tests/data/test-diff-suppr/test-has-data-member-v0.o b/tests/data/test-diff-suppr/test-has-data-member-v0.o
new file mode 100644 (file)
index 0000000..dfbebe4
Binary files /dev/null and b/tests/data/test-diff-suppr/test-has-data-member-v0.o differ

diff --git a/tests/data/test-diff-suppr/test-has-data-member-v1.cc b/tests/data/test-diff-suppr/test-has-data-member-v1.cc
new file mode 100644 (file)
index 0000000..afedcf9
--- /dev/null
+++ b/tests/data/test-diff-suppr/test-has-data-member-v1.cc
@@ -0,0 +1,24 @@
+struct S0
+{
+  int private_data_member0;
+  char private_data_member1;
+  int suppressed_added_member;
+};
+
+struct S1
+{
+  int m0;
+  char non_suppressed_added_member;
+};
+
+
+void
+foo(S0&)
+{
+}
+
+int
+bar(S1* s)
+{
+  return s->m0;
+}

diff --git a/tests/data/test-diff-suppr/test-has-data-member-v1.o b/tests/data/test-diff-suppr/test-has-data-member-v1.o
new file mode 100644 (file)
index 0000000..b5bfe12
Binary files /dev/null and b/tests/data/test-diff-suppr/test-has-data-member-v1.o differ

diff --git a/tests/test-diff-suppr.cc b/tests/test-diff-suppr.cc
index d9efa86493c64cfcfa5cfd1ef2b2f6ec03403f95..645afe53d995d1ba459b062709c6fb729a2ddf2a 100644 (file)
--- a/tests/test-diff-suppr.cc
+++ b/tests/test-diff-suppr.cc
@@ -2056,6 +2056,86 @@ InOutSpec in_out_specs[] =
     "data/test-diff-suppr/PR28073/PR28073-output-2.txt",
     "output/test-diff-suppr/PR28073/PR28073-output-2.txt"
   },
+  {
+    "data/test-diff-suppr/test-has-data-member-v0.o",
+    "data/test-diff-suppr/test-has-data-member-v1.o",
+    "",
+    "",
+    "",
+    "--drop-private-types --no-default-suppression",
+    "data/test-diff-suppr/test-has-data-member-output-1.txt",
+    "output/test-diff-suppr/test-has-data-member-output-1.txt"
+  },
+  {
+    "data/test-diff-suppr/test-has-data-member-v0.o",
+    "data/test-diff-suppr/test-has-data-member-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/has-data-member-1.suppr",
+    "--drop-private-types --no-default-suppression",
+    "data/test-diff-suppr/test-has-data-member-output-2.txt",
+    "output/test-diff-suppr/test-has-data-member-output-2.1.txt"
+  },
+  {
+    "data/test-diff-suppr/test-has-data-member-v0.o",
+    "data/test-diff-suppr/test-has-data-member-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/has-data-member-2.suppr",
+    "--drop-private-types --no-default-suppression",
+    "data/test-diff-suppr/test-has-data-member-output-2.txt",
+    "output/test-diff-suppr/test-has-data-member-output-2.2.txt"
+  },
+  {
+    "data/test-diff-suppr/test-has-data-member-v0.o",
+    "data/test-diff-suppr/test-has-data-member-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/has-data-member-3.suppr",
+    "--drop-private-types --no-default-suppression",
+    "data/test-diff-suppr/test-has-data-member-output-2.txt",
+    "output/test-diff-suppr/test-has-data-member-output-2.3.txt"
+  },
+  {
+    "data/test-diff-suppr/test-has-data-member-v0.o",
+    "data/test-diff-suppr/test-has-data-member-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/has-data-member-4.suppr",
+    "--drop-private-types --no-default-suppression",
+    "data/test-diff-suppr/test-has-data-member-output-1.txt",
+    "output/test-diff-suppr/test-has-data-member-output-1.2.txt"
+  },
+  {
+    "data/test-diff-suppr/test-has-data-member-v0.o",
+    "data/test-diff-suppr/test-has-data-member-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/has-data-member-5.suppr",
+    "--drop-private-types --no-default-suppression",
+    "data/test-diff-suppr/test-has-data-member-output-1.txt",
+    "output/test-diff-suppr/test-has-data-member-output-1.3.txt"
+  },
+  {
+    "data/test-diff-suppr/test-has-data-member-v0.o",
+    "data/test-diff-suppr/test-has-data-member-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/has-data-member-6.suppr",
+    "--drop-private-types --no-default-suppression",
+    "data/test-diff-suppr/test-has-data-member-output-2.txt",
+    "output/test-diff-suppr/test-has-data-member-output-2.4.txt"
+  },
+    {
+    "data/test-diff-suppr/test-has-data-member-v0.o",
+    "data/test-diff-suppr/test-has-data-member-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/has-data-member-7.suppr",
+    "--drop-private-types --no-default-suppression",
+    "data/test-diff-suppr/test-has-data-member-output-1.txt",
+    "output/test-diff-suppr/test-has-data-member-output-1.4.txt"
+  },
   // This should be the last entry
   {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
 };