codegen: Fix property access inside opaque compact class

Avoid using "priv" when accessing a private or internal field backing a
property of a compact class.

diff --git a/codegen/valaccodememberaccessmodule.vala b/codegen/valaccodememberaccessmodule.vala
index d5d0890108d2cc71a0ac0dbeaee8692054626052..ae9fca482194f602253d92ca774ecb7682442da1 100644 (file)
--- a/codegen/valaccodememberaccessmodule.vala
+++ b/codegen/valaccodememberaccessmodule.vala
@@ -266,8 +266,10 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
                            prop.base_property == null &&
                            prop.base_interface_property == null &&
                            !(prop.property_type is ArrayType || prop.property_type is DelegateType)) {
-                               CCodeExpression inst;
-                               inst = new CCodeMemberAccess.pointer (pub_inst, "priv");
+                               CCodeExpression inst = pub_inst;
+                               if (!((Class) current_type_symbol).is_compact) {
+                                       inst = new CCodeMemberAccess.pointer (inst, "priv");
+                               }
                                set_cvalue (expr, new CCodeMemberAccess.pointer (inst, get_ccode_name (prop.field)));
                        } else if (!get_ccode_no_accessor_method (prop)) {
                                string getter_cname;

diff --git a/tests/semantic/class-opaque-automatic-property.vala b/tests/semantic/class-opaque-automatic-property.vala
index 8400a78b53111fc4a589ae23d1f8c63966060110..893d03f42ad37f08545637a479744f6cb2b7ad97 100644 (file)
--- a/tests/semantic/class-opaque-automatic-property.vala
+++ b/tests/semantic/class-opaque-automatic-property.vala
@@ -1,10 +1,16 @@
 [Compact (opaque = true)]
 public class Foo {
        public int bar { get; set; }
+
+       public void manam () {
+               bar = 23;
+               assert (bar == 23);
+       }
 }
 
 void main () {
        var foo = new Foo ();
+       foo.manam ();
        foo.bar = 42;
        assert (foo.bar == 42);
 }