Special case meson.version().version_compare() in ternaries also

This is a corollary to mesonbuild#7594, but in ternaries.

Author: QuLogic

mesonbuild/interpreterbase/interpreterbase.py

@@ -36,7 +36,7 @@
 from .operator import MesonOperator
 from ._unholder import _unholder
 
-import os, copy, hashlib, re, pathlib
+import contextlib, copy, hashlib, os, pathlib, re
 import typing as T
 import textwrap
 
@@ -103,6 +103,20 @@ def handle_meson_version_from_ast(self) -> None:
         # do nothing in an AST interpreter
         return
 
+    @contextlib.contextmanager
+    def set_tmp_project_meson_version(self) -> T.Iterator[None]:
+        prev_meson_version = mesonlib.project_meson_versions[self.subproject]
+        if self.tmp_meson_version and isinstance(prev_meson_version, mesonlib.Range):
+            always = prev_meson_version.always(self.tmp_meson_version)
+            if always is not None:
+                mlog.warning(f"Conditional on version '{self.tmp_meson_version}' always evaluates to {str(always).lower()}",
+                             location=self.current_node)
+            mesonlib.project_meson_versions[self.subproject] = prev_meson_version.intersect(self.tmp_meson_version)
+        try:
+            yield
+        finally:
+            mesonlib.project_meson_versions[self.subproject] = prev_meson_version
+
     def read_buildfile(self, fname: str, errname: str) -> str:
         try:
             with open(fname, encoding='utf-8') as f:
@@ -311,19 +325,10 @@ def evaluate_if(self, node: mparser.IfClauseNode) -> T.Optional[Disabler]:
             res = result.operator_call(MesonOperator.BOOL, None)
             if not isinstance(res, bool):
                 raise InvalidCode(f'If clause {result!r} does not evaluate to true or false.')
-            prev_meson_version = mesonlib.project_meson_versions[self.subproject]
-            if self.tmp_meson_version and isinstance(prev_meson_version, mesonlib.Range):
-                always = prev_meson_version.always(self.tmp_meson_version)
-                if always is not None:
-                    mlog.warning(f"Conditional on version '{self.tmp_meson_version}' always evaluates to {str(always).lower()}",
-                                 location=self.current_node)
-                mesonlib.project_meson_versions[self.subproject] = prev_meson_version.intersect(self.tmp_meson_version)
-            try:
+            with self.set_tmp_project_meson_version():
                 if res:
                     self.evaluate_codeblock(i.block)
                     return None
-            finally:
-                mesonlib.project_meson_versions[self.subproject] = prev_meson_version
         if not isinstance(node.elseblock, mparser.EmptyNode):
             self.evaluate_codeblock(node.elseblock.block)
         return None
@@ -415,6 +420,9 @@ def evaluate_arithmeticstatement(self, cur: mparser.ArithmeticNode) -> Interpret
         return self._holderify(res)
 
     def evaluate_ternary(self, node: mparser.TernaryNode) -> T.Optional[InterpreterObject]:
+        # Reset self.tmp_meson_version to know if it gets set during this
+        # statement evaluation.
+        self.tmp_meson_version = None
         result = self.evaluate_statement(node.condition)
         if result is None:
             raise mesonlib.MesonException('Cannot use a void statement as condition for ternary operator.')
@@ -423,7 +431,8 @@ def evaluate_ternary(self, node: mparser.TernaryNode) -> T.Optional[InterpreterO
         result.current_node = node
         result_bool = result.operator_call(MesonOperator.BOOL, None)
         if result_bool:
-            return self.evaluate_statement(node.trueblock)
+            with self.set_tmp_project_meson_version():
+                return self.evaluate_statement(node.trueblock)
         else:
             return self.evaluate_statement(node.falseblock)
 

test cases/unit/81 meson version compare/meson.build

@@ -7,12 +7,16 @@ elif meson.version().version_compare('>= 0.55') and false
 elif not meson.version().version_compare('>= 0.55')
   error('This should not be executed')
 elif meson.version().version_compare('>= 0.55')
-  # This Should not produce warning even when using function not available in
-  # meson 0.1.
+  # This should not produce a warning even when using a function not available
+  # in Meson 0.1.
   foo_dep = declare_dependency()
   meson.override_dependency('foo', foo_dep)
 endif
 
+# This should not produce a warning even when using a function not available in
+# Meson 0.1.
+lib_suffix = meson.version().version_compare('>=1.12.0') ? default() : []
+
 # This will error out if elif cause did not enter
 assert(foo_dep.found(), 'meson.version_compare did not work')
 

test cases/unit/81 meson version compare/subprojects/foo/meson.build

@@ -1,8 +1,8 @@
 project('foo', meson_version: '>= 0.1')
 
 if meson.version().version_compare('>= 0.55')
-  # This Should not produce warning even when using function not available in
-  # meson 0.1.
+  # This should not produce a warning even when using a function not available
+  # in Meson 0.1.
   foo_dep = declare_dependency()
   meson.override_dependency('foo2', foo_dep)
 endif