]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
Revert "vala: Don't replace assignments for local variables with non-null simple...
authorRico Tzschichholz <ricotz@ubuntu.com>
Thu, 21 Feb 2019 07:34:30 +0000 (08:34 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Thu, 21 Feb 2019 07:38:39 +0000 (08:38 +0100)
This reverts commit e701142da4601ece5ca71cc4484728b08969c74e.

Fixes https://gitlab.gnome.org/GNOME/vala/issues/755

vala/valaassignment.vala

index 1c449ed74bb37afa6b8f8f0eef332a3160bdc3ba..414edd0178be078429f229374d8cc38302c368db 100644 (file)
@@ -224,13 +224,13 @@ public class Vala.Assignment : Expression {
                        return false;
                }
 
-               unowned MemberAccess? ma = left as MemberAccess;
-               if (operator != AssignmentOperator.SIMPLE && ma != null
-                   && !(left.value_type.is_non_null_simple_type () && ma.symbol_reference is LocalVariable)) {
+               if (operator != AssignmentOperator.SIMPLE && left is MemberAccess) {
                        // transform into simple assignment
                        // FIXME: only do this if the backend doesn't support
                        // the assignment natively
 
+                       var ma = (MemberAccess) left;
+
                        var old_value = new MemberAccess (ma.inner, ma.member_name);
 
                        BinaryOperator bop;
@@ -260,7 +260,9 @@ public class Vala.Assignment : Expression {
                        operator = AssignmentOperator.SIMPLE;
                }
 
-               if (ma != null) {
+               if (left is MemberAccess) {
+                       var ma = (MemberAccess) left;
+
                        if (ma.symbol_reference is Property) {
                                var prop = (Property) ma.symbol_reference;