Skip to content

Commit 03a0926

Browse files
bonzinidcbaker
authored andcommitted
rewrite: fix duplicate objects for predefined globals
Global objects are treated as UnknownValue(), but unlike other variables their object is created on every call to get_cur_value_if_defined() instead of coming from a dictionary. This causes the dataflow DAG to have multiple objects from the same object. Fix this by building the UnknownValues at interpreter construction time. Fixes: mesonbuild#15261 Signed-off-by: Paolo Bonzini <[email protected]>
1 parent e38b2e8 commit 03a0926

4 files changed

Lines changed: 31 additions & 2 deletions

File tree

‎mesonbuild/ast/interpreter.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,12 @@ def __init__(self, source_root: str, subdir: str, subproject: SubProject, subpro
188188
self.dataflow_dag = DataflowDAG()
189189
self.funcvals: T.Dict[BaseNode, T.Any] = {}
190190
self.tainted = False
191+
self.predefined_vars = {
192+
'meson': UnknownValue(),
193+
'host_machine': UnknownValue(),
194+
'build_machine': UnknownValue(),
195+
'target_machine': UnknownValue()
196+
}
191197
self.funcs.update({'project': self.func_do_nothing,
192198
'test': self.func_do_nothing,
193199
'benchmark': self.func_do_nothing,
@@ -486,8 +492,8 @@ def func_files(self, node: BaseNode, args: T.List[TYPE_var], kwargs: T.Dict[str,
486492
return ret
487493

488494
def get_cur_value_if_defined(self, var_name: str) -> T.Union[BaseNode, UnknownValue, UndefinedVariable]:
489-
if var_name in {'meson', 'host_machine', 'build_machine', 'target_machine'}:
490-
return UnknownValue()
495+
if var_name in self.predefined_vars:
496+
return self.predefined_vars[var_name]
491497
ret: T.Union[BaseNode, UnknownValue, UndefinedVariable] = UndefinedVariable()
492498
for nesting, value in reversed(self.cur_assignments[var_name]):
493499
if len(self.nesting) >= len(nesting) and self.nesting[:len(nesting)] == nesting:
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[
2+
{
3+
"type": "kwargs",
4+
"function": "project",
5+
"id": "/",
6+
"operation": "info"
7+
}
8+
]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
project('a', 'c', license: 'MIT')
2+
set_variable(
3+
'z',
4+
'-Wl,--version-script,@0@/src/lib.sym'.format(meson.current_source_dir())
5+
)

‎unittests/rewritetests.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,16 @@ def test_target_remove_extra_files(self):
445445
out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json'))
446446
self.assertEqualIgnoreOrder(out, expected)
447447

448+
def test_duplicate_globals(self):
449+
self.prime('10 duplicate globals')
450+
out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json'))
451+
expected = {
452+
'kwargs': {
453+
'project#/': {'license': 'MIT'}
454+
}
455+
}
456+
self.assertEqualIgnoreOrder(out, expected)
457+
448458
def test_tricky_dataflow(self):
449459
self.prime('8 tricky dataflow')
450460
out = self.rewrite(self.builddir, os.path.join(self.builddir, 'addSrc.json'))

0 commit comments

Comments
 (0)