Fixed a regression causing incorrect sizes of types derived from temp…

…late instantiations. Signed-off-by: Dimitar Dobrev <[email protected]>
mono · Sep 20, 2015 · c183200 · c183200
1 parent b908881
commit c183200
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 5 deletions.
diff --git a/src/Generator/Passes/CheckAbiParameters.cs b/src/Generator/Passes/CheckAbiParameters.cs
@@ -87,7 +87,8 @@ private static bool HasFieldsOrVirtuals(Class @class)
         {
             if (@class.Fields.Count > 0 || @class.IsDynamic)
                 return true;
-            return @class.HasBaseClass && @class.Bases.Any(@base => @base.IsClass && HasFieldsOrVirtuals(@base.Class));
+            return @class.Bases.Any(@base => @base.IsClass && @base.Class != @class &&
+                HasFieldsOrVirtuals(@base.Class));
         }
     }
 }
diff --git a/tests/CSharp/CSharp.Tests.cs b/tests/CSharp/CSharp.Tests.cs
@@ -437,4 +437,10 @@ public void TestConversionForCtorWithDefaultParams()
             Assert.That(foo.A, Is.EqualTo(15));
         }
     }
+
+    [Test]
+    public unsafe void TestSizeOfDerivesFromTemplateInstantiation()
+    {
+        Assert.That(sizeof(DerivesFromTemplateInstantiation.Internal), Is.EqualTo(sizeof(int)));
+    }
 }
diff --git a/tests/CSharp/CSharp.cpp b/tests/CSharp/CSharp.cpp
@@ -789,3 +789,12 @@ void TestOutTypeInterfaces::funcTryInterfaceTypePtrOut(CS_OUT TestParamToInterfa
 void TestOutTypeInterfaces::funcTryInterfaceTypeOut(CS_OUT TestParamToInterfacePassBaseTwo classTry)
 {
 }
+
+template <typename T>
+TemplateWithDependentField<T>::TemplateWithDependentField()
+{
+}
+
+DerivesFromTemplateInstantiation::DerivesFromTemplateInstantiation()
+{
+}
diff --git a/tests/CSharp/CSharp.h b/tests/CSharp/CSharp.h
@@ -708,12 +708,26 @@ class OverrideFromIndirectSecondaryBase : public OverrideFromDirectSecondaryBase
 class DLL_API TestVariableWithFixedArrayType
 {
 public:
-	static Foo variableWithFixedArrayType[2];
+    static Foo variableWithFixedArrayType[2];
 };
 
 class DLL_API TestOutTypeInterfaces
 {
 public:
-	void funcTryInterfaceTypePtrOut(CS_OUT TestParamToInterfacePassBaseTwo* classTry);
-	void funcTryInterfaceTypeOut(CS_OUT TestParamToInterfacePassBaseTwo classTry);
+    void funcTryInterfaceTypePtrOut(CS_OUT TestParamToInterfacePassBaseTwo* classTry);
+    void funcTryInterfaceTypeOut(CS_OUT TestParamToInterfacePassBaseTwo classTry);
+};
+
+template <typename T>
+class TemplateWithDependentField
+{
+public:
+    TemplateWithDependentField();
+    T t;
+};
+
+class DerivesFromTemplateInstantiation : public TemplateWithDependentField<int>
+{
+public:
+    DerivesFromTemplateInstantiation();
 };
diff --git a/tests/Common/Common.h b/tests/Common/Common.h
@@ -842,4 +842,7 @@ namespace boost
 {
     template <class T>         struct is_member_pointer_cv         { static const bool value = false; };
     template <class T, class U>struct is_member_pointer_cv<T U::*> { static const bool value = true; };
-}
+}
+
+template <std::size_t N, std::size_t... I>
+struct build_index_impl : build_index_impl<N - 1, N - 1, I...> {};