prevent disabler() object from overwriting arrays (mesonbuild#7484)

* prevent disabler object from overwriting arrays

fixes mesonbuild#7107

* fix failing test

forgot that func() != func(void) in c

Author: apache-hb

mesonbuild/interpreterbase.py

@@ -810,9 +810,7 @@ def evaluate_plusassign(self, node: mparser.PlusAssignmentNode) -> None:
         assert(isinstance(node, mparser.PlusAssignmentNode))
         varname = node.var_name
         addition = self.evaluate_statement(node.value)
-        if is_disabler(addition):
-            self.set_variable(varname, addition)
-            return
+
         # Remember that all variables are immutable. We must always create a
         # full new variable and then assign it.
         old_variable = self.get_variable(varname)
@@ -836,7 +834,7 @@ def evaluate_plusassign(self, node: mparser.PlusAssignmentNode) -> None:
             new_value = {**old_variable, **addition}
         # Add other data types here.
         else:
-            raise InvalidArguments('The += operator currently only works with arrays, dicts, strings or ints ')
+            raise InvalidArguments('The += operator currently only works with arrays, dicts, strings or ints')
         self.set_variable(varname, new_value)
 
     def evaluate_indexing(self, node: mparser.IndexNode) -> TYPE_var:

test cases/common/235 disabler array addition/meson.build

@@ -0,0 +1,9 @@
+project('disabler_inside_array', 'c')
+
+exes = []
+
+exes += library('a', 'test.c')
+
+exes += library('b', 'test.c', dependencies : disabler())
+
+exes += library('c', 'test.c')

test cases/common/235 disabler array addition/test.c

@@ -0,0 +1 @@
+int stub(void) { return 0; }