Fix base access of properties

Fixes another bug in 702736

diff --git a/codegen/valaccodememberaccessmodule.vala b/codegen/valaccodememberaccessmodule.vala
index e9aefd5c9864c5d40b61b07f1ca74028d9ff8330..6becb19768c94fc6d05495c499740dc9c9f19f14 100644 (file)
--- a/codegen/valaccodememberaccessmodule.vala
+++ b/codegen/valaccodememberaccessmodule.vala
@@ -167,16 +167,22 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
                        }
 
                        if (expr.inner is BaseAccess) {
+                               var base_prop = prop;
                                if (prop.base_property != null) {
-                                       var base_class = (Class) prop.base_property.parent_symbol;
+                                       base_prop = prop.base_property;
+                               } else if (prop.base_interface_property != null) {
+                                       base_prop = prop.base_interface_property;
+                               }
+                               if (base_prop.parent_symbol is Class) {
+                                       var base_class = (Class) base_prop.parent_symbol;
                                        var vcast = new CCodeFunctionCall (new CCodeIdentifier ("%s_CLASS".printf (get_ccode_upper_case_name (base_class, null))));
                                        vcast.add_argument (new CCodeIdentifier ("%s_parent_class".printf (get_ccode_lower_case_name (current_class, null))));
                                        
                                        var ccall = new CCodeFunctionCall (new CCodeMemberAccess.pointer (vcast, "get_%s".printf (prop.name)));
                                        ccall.add_argument (get_cvalue (expr.inner));
                                        set_cvalue (expr, ccall);
-                               } else if (prop.base_interface_property != null) {
-                                       var base_iface = (Interface) prop.base_interface_property.parent_symbol;
+                               } else if (base_prop.parent_symbol is Interface) {
+                                       var base_iface = (Interface) base_prop.parent_symbol;
                                        string parent_iface_var = "%s_%s_parent_iface".printf (get_ccode_lower_case_name (current_class), get_ccode_lower_case_name (base_iface));
 
                                        var ccall = new CCodeFunctionCall (new CCodeMemberAccess.pointer (new CCodeIdentifier (parent_iface_var), "get_%s".printf (prop.name)));

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d9c7c9689164a8ff6be451eaa009af3385fd7b02..5b16544afb7ac2deed8b5f06f1c6304299e653a0 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -136,6 +136,7 @@ TESTS = \
        objects/bug683646.vala \
        objects/bug695671.vala \
        objects/bug701978.vala \
+       objects/bug702736.vala \
        errors/errors.vala \
        errors/bug567181.vala \
        errors/bug579101.vala \

diff --git a/tests/objects/bug702736.vala b/tests/objects/bug702736.vala
new file mode 100644 (file)
index 0000000..7169501
--- /dev/null
+++ b/tests/objects/bug702736.vala
@@ -0,0 +1,27 @@
+public abstract class ClassA : Object {
+    public abstract int flags { get; }
+}
+
+public class ClassB : ClassA {
+    public override int flags { get { return 1; } }
+}
+
+public class ClassC : ClassB {
+    public void foo() {
+    }
+}
+
+public class ClassD : ClassC {
+    public override int flags {
+        get {
+            var old_flags = base.flags;
+
+            return old_flags | 2;
+        }
+    }
+}
+
+void main () {
+    var d = new ClassD ();
+       assert (d.flags == 3);
+}