Bug rhbz1638554 - assertion failed in is_mostly_distinct_diff

	* src/abg-comp-filter.cc (is_mostly_distinct_diff): Handle the
	case of the type diff of the function parameter diff being a
	distinct diff.

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

diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc
index 50daf9747decca7bbafc5d11ed6f157f1557aff6..7f6eb967049cd9a473239b21827ec43115ce6370 100644 (file)
--- a/src/abg-comp-filter.cc
+++ b/src/abg-comp-filter.cc
@@ -920,14 +920,21 @@ is_mostly_distinct_diff(const diff *d)
     return true;
 
   // Let's consider that 'd' is a type diff ...
-  type_diff_base* td = const_cast<type_diff_base*>(is_type_diff(d));
+  diff * td = const_cast<type_diff_base*>(is_type_diff(d));
   if (!td)
     {
       // ... or a function parameter diff.  In which case, let's get
-      // its child type diff.
+      // its child type diff ...
       fn_parm_diff *pd = const_cast<fn_parm_diff*>(is_fn_parm_diff(d));
       if (pd)
-       td = const_cast<type_diff_base*>(is_type_diff(pd->type_diff().get()));
+       {
+         td = const_cast<type_diff_base*>(is_type_diff(pd->type_diff().get()));
+         if (!td)
+           // if the diff of the fn_parm_diff is a a distinct diff
+           // then handle it.
+           td = const_cast<distinct_diff*>
+             (is_distinct_diff(pd->type_diff().get()));
+       }
       else
        return false;
     }