interpreter: Fix missing holder entry (fixes #9389)

mesonbuild/interpreter/interpreter.py

@@ -19,6 +19,7 @@ from .. import mlog
 from .. import build
 from .. import optinterpreter
 from .. import compilers
+from .. import envconfig
 from ..wrap import wrap, WrapMode
 from .. import mesonlib
 from ..mesonlib import MesonBugException, HoldableObject, FileMode, MachineChoice, OptionKey, listify, extract_as_list, has_path_sep
@@ -419,6 +420,7 @@ class Interpreter(InterpreterBase, HoldableObject):
             compilers.RunResult: compilerOBJ.TryRunResultHolder,
             dependencies.ExternalLibrary: OBJ.ExternalLibraryHolder,
             coredata.UserFeatureOption: OBJ.FeatureOptionHolder,
+            envconfig.MachineInfo: OBJ.MachineHolder,
         })
 
         '''

test cases/common/188 dict/meson.build

@@ -69,3 +69,14 @@ assert(d[k2] == 2, 'Incorrect expression evaluation in dictionary key')
 d = {'a' + 'b' : 1}
 assert(d['a' + 'b'] == 1, 'Incorrect expression evaluation in dictionary key')
 assert(d['ab'] == 1, 'Incorrect expression evaluation in dictionary key')
+
+# Complex types
+d = {
+  'sanity': 1,
+  'host': host_machine,
+  'meson': meson,
+}
+
+assert(d['sanity'] == 1)
+assert(not is_disabler(d['meson']))
+assert(not is_disabler(d['host']))