Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
QuLogic wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −5
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion mesonbuild/interpreterbase/interpreterbase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,15 +415,29 @@ 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.')
if isinstance(result, Disabler):
return result
result.current_node = node
result_bool = result.operator_call(MesonOperator.BOOL, 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)
if result_bool:
Comment on lines +428 to 434

@bonzini bonzini Aug 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be a function, like

if self.tmp_meson_version:
    prev_meson_version = set_project_meson_version(self.subproject, self.tmp_meson_version)
try:
    if result_bool:
        return self.evaluate_statement(node.trueblock)
finally:
    mesonlib.project_meson_versions[self.subproject] = prev_meson_version

So that there are just 3-4 lines of copied code between ?: and if evaluation.

return self.evaluate_statement(node.trueblock)
if self.tmp_meson_version and isinstance(prev_meson_version, mesonlib.Range):
mesonlib.project_meson_versions[self.subproject] = prev_meson_version.intersect(self.tmp_meson_version)
try:
return self.evaluate_statement(node.trueblock)
finally:
mesonlib.project_meson_versions[self.subproject] = prev_meson_version
else:
return self.evaluate_statement(node.falseblock)

Expand Down
8 changes: 6 additions & 2 deletions test cases/unit/81 meson version compare/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
4 changes: 2 additions & 2 deletions test cases/unit/81 meson version compare/subprojects/foo/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading