Fixed a crash with abstract overrides originating from secondary bases.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>

src/AST/ClassExtensions.cs

@@ -75,10 +75,7 @@ namespace CppSharp.AST
                 }
 
                 baseMethod = (from method in @base.Class.Methods
-                    where (method.OriginalName == @override.OriginalName &&
-                        method.ReturnType == @override.ReturnType &&
-                        method.Parameters.SequenceEqual(@override.Parameters, parameterTypeComparer)) ||
-                        (@override.IsDestructor && method.IsDestructor && method.IsVirtual)
+                    where @override.CanOverride(method, parameterTypeComparer)
                     select method).FirstOrDefault();
                 if (baseMethod != null)
                     return baseMethod;

src/AST/FunctionExtensions.cs

@@ -72,5 +72,15 @@ namespace CppSharp.AST
 
             return @params;
         }
+
+        public static bool CanOverride(this Method @override, Method method,
+            ParameterTypeComparer parameterTypeComparer = null)
+        {
+            parameterTypeComparer = parameterTypeComparer ?? new ParameterTypeComparer();
+            return (method.OriginalName == @override.OriginalName &&
+                method.ReturnType == @override.ReturnType &&
+                method.Parameters.SequenceEqual(@override.Parameters, parameterTypeComparer)) ||
+                (@override.IsDestructor && method.IsDestructor && method.IsVirtual);
+        }
     }
 }

src/Generator/AST/VTables.cs

@@ -54,7 +54,6 @@ namespace CppSharp.AST
             return GatherVTableMethodEntries(@class.Layout.Layout);
         }
 
-
         public static int GetVTableIndex(Function function, Class @class)
         {
             switch (@class.Layout.ABI)

src/Generator/Passes/GenerateAbstractImplementationsPass.cs

@@ -130,8 +130,14 @@ namespace CppSharp.Passes
         private static List<Method> GetAbstractMethods(Class @class)
         {
             var abstractMethods = @class.Methods.Where(m => m.IsPure).ToList();
-            foreach (var @base in @class.Bases)
-                abstractMethods.AddRange(GetAbstractMethods(@base.Class));
+            var abstractOverrides = abstractMethods.Where(a => a.IsOverride).ToList();
+            foreach (var baseAbstractMethods in @class.Bases.Select(b => GetAbstractMethods(b.Class)))
+            {
+                for (var i = baseAbstractMethods.Count - 1; i >= 0; i--)
+                    if (abstractOverrides.Any(a => a.CanOverride(baseAbstractMethods[i])))
+                        baseAbstractMethods.RemoveAt(i);
+                abstractMethods.AddRange(baseAbstractMethods);
+            }
 
             return abstractMethods;
         }

tests/CSharp/CSharp.cpp

@@ -883,6 +883,10 @@ int OverridePropertyFromIndirectPrimaryBase::property()
     return 5;
 }
 
+AbstractOverrideFromSecondaryBase::AbstractOverrideFromSecondaryBase()
+{
+}
+
 QObject::QObject()
 {
 }

tests/CSharp/CSharp.h

@@ -780,6 +780,13 @@ public:
     int property();
 };
 
+class DLL_API AbstractOverrideFromSecondaryBase : public Foo, public OverridePropertyFromIndirectPrimaryBaseBase
+{
+public:
+    AbstractOverrideFromSecondaryBase();
+    virtual void setProperty(int value) = 0;
+};
+
 class DLL_API QObject
 {
 public: