Fixed the renaming of overrides in a certain situation.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
mono · Aug 4, 2015 · c8da628 · c8da628
1 parent cd3e729
commit c8da628
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 22 deletions.
diff --git a/src/AST/ASTVisitor.cs b/src/AST/ASTVisitor.cs
@@ -291,7 +291,10 @@ public virtual bool VisitProperty(Property property)
             if (!VisitDeclaration(property))
                 return false;
 
-            return property.Type.Visit(this);
+            if (Options.VisitFunctionReturnType)
+                return property.Type.Visit(this);
+
+            return true;
         }
 
         public bool VisitFriend(Friend friend)

diff --git a/src/AST/ClassExtensions.cs b/src/AST/ClassExtensions.cs
@@ -57,7 +57,7 @@ public static Class GetNonIgnoredRootBase(this Class @class)
         public static Method GetRootBaseMethod(this Class c, Method @override, bool onlyFirstBase = false)
         {
             return (from @base in c.Bases
-                where @base.IsClass && (!onlyFirstBase || !@base.Class.IsInterface)
+                where @base.IsClass && @base.Class.OriginalClass != c && (!onlyFirstBase || !@base.Class.IsInterface)
                 let baseMethod = (
                     from method in @base.Class.Methods
                     where
@@ -74,15 +74,15 @@ public static Method GetRootBaseMethod(this Class c, Method @override, bool only
         public static Property GetRootBaseProperty(this Class c, Property @override, bool onlyFirstBase = false)
         {
             return (from @base in c.Bases
-                where (!onlyFirstBase || !@base.Class.IsInterface) && @base.IsClass
+                where @base.IsClass && @base.Class.OriginalClass != c && (!onlyFirstBase || !@base.Class.IsInterface)
                 let baseProperty = (
                     from property in @base.Class.Properties
                     where
                         property.OriginalName == @override.OriginalName &&
                         property.Parameters.SequenceEqual(@override.Parameters,
                             new ParameterTypeComparer())
                     select property).FirstOrDefault()
-                let rootBaseProperty = @base.Class.GetRootBaseProperty(@override) ?? baseProperty
+                let rootBaseProperty = @base.Class.GetRootBaseProperty(@override, onlyFirstBase) ?? baseProperty
                 where rootBaseProperty != null || onlyFirstBase
                 select rootBaseProperty).FirstOrDefault();
         }

diff --git a/src/Generator/Passes/RenamePass.cs b/src/Generator/Passes/RenamePass.cs
@@ -30,9 +30,13 @@ public int GetHashCode(Parameter obj)
 
         protected RenamePass()
         {
+            Options.VisitFunctionReturnType = false;
+            Options.VisitFunctionParameters = false;
+            Options.VisitTemplateArguments = false;
         }
 
         protected RenamePass(RenameTargets targets)
+            : this()
         {
             Targets = targets;
         }
@@ -85,23 +89,6 @@ public bool IsRenameableDecl(Declaration decl)
             return false;
         }
 
-        public override bool VisitClassDecl(Class @class)
-        {
-            if (@class.IsDynamic)
-            {
-                // HACK: entries in v-tables are not shared (as objects) with the virtual methods they represent;
-                // this is why this pass has to rename entries in the v-table as well;
-                // this should be fixed in the parser: it should reuse method objects
-                foreach (var method in VTables.GatherVTableMethodEntries(@class).Where(
-                    e => e.Method != null && IsRenameableDecl(e.Method)).Select(e => e.Method))
-                {
-                    Rename(method);
-                }
-            }
-
-            return base.VisitClassDecl(@class);
-        }
-
         public override bool VisitDeclaration(Declaration decl)
         {
             if (AlreadyVisited(decl))

diff --git a/tests/CSharpTemp/CSharpTemp.Tests.cs b/tests/CSharpTemp/CSharpTemp.Tests.cs
@@ -27,6 +27,8 @@ public void TestUncompilableCode()
             var isNoParams = foo.IsNoParams;
             foo.SetNoParams();
         }
+        using (var hasOverride = new HasOverrideOfHasPropertyWithDerivedType())
+            hasOverride.CauseRenamingError();
         // TODO: remove when the bug in question is fixed
         if (Type.GetType("Mono.Runtime") != null)
         {
@@ -343,5 +345,4 @@ public void TestNullAttributedFunctionPtr()
             foo.AttributedFunctionPtr = null;
         }
     }
-
 }
diff --git a/tests/CSharpTemp/CSharpTemp.cpp b/tests/CSharpTemp/CSharpTemp.cpp
@@ -672,3 +672,19 @@ int TypeMappedWithOperator::operator |(int i)
 {
    return 0;
 }
+
+HasPropertyWithDerivedType::HasPropertyWithDerivedType()
+{
+}
+
+void HasPropertyWithDerivedType::causeRenamingError()
+{
+}
+
+HasOverrideOfHasPropertyWithDerivedType::HasOverrideOfHasPropertyWithDerivedType()
+{
+}
+
+void HasOverrideOfHasPropertyWithDerivedType::causeRenamingError()
+{
+}
diff --git a/tests/CSharpTemp/CSharpTemp.h b/tests/CSharpTemp/CSharpTemp.h
@@ -600,3 +600,20 @@ class DLL_API TypeMappedWithOperator
     TypeMappedWithOperator();
     int operator |(int i);
 };
+
+class HasOverrideOfHasPropertyWithDerivedType;
+
+class DLL_API HasPropertyWithDerivedType
+{
+public:
+    HasPropertyWithDerivedType();
+    HasOverrideOfHasPropertyWithDerivedType* hasPropertyWithDerivedTypeSubclass;
+    virtual void causeRenamingError();
+};
+
+class DLL_API HasOverrideOfHasPropertyWithDerivedType : public HasPropertyWithDerivedType
+{
+public:
+    HasOverrideOfHasPropertyWithDerivedType();
+    virtual void causeRenamingError();
+};