add for_machine to DependencyFallbacksHolder

Store it at construction time instead of extracting it from kwargs
repeatedly.

Extracted from a patch by Dylan Baker <dylan@pnwbakers.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Author: bonzini

mesonbuild/interpreter/dependencyfallbacks.py

@@ -29,13 +29,13 @@
 class DependencyFallbacksHolder(MesonInterpreterObject):
     def __init__(self,
                  interpreter: 'Interpreter',
-                 names: T.List[str],
+                 names: T.List[str], for_machine: MachineChoice,
                  allow_fallback: T.Optional[bool] = None,
                  default_options: T.Optional[T.Dict[OptionKey, ElementaryOptionValues]] = None) -> None:
         super().__init__(subproject=interpreter.subproject)
         self.interpreter = interpreter
         self.subproject = interpreter.subproject
-        self.for_machine = MachineChoice.HOST
+        self.for_machine = for_machine
         self.coredata = interpreter.coredata
         self.build = interpreter.build
         self.environment = interpreter.environment
@@ -97,9 +97,8 @@ def _do_dependency(self, kwargs: DependencyObjectKWs, name: str, func_kwargs: Do
         self._handle_featurenew_dependencies(name)
         dep = dependencies.find_external_dependency(name, self.environment, kwargs)
         if dep.found():
-            for_machine = kwargs.get('native', MachineChoice.HOST)
             identifier = dependencies.get_dep_identifier(name, kwargs)
-            self.coredata.deps[for_machine].put(identifier, dep)
+            self.coredata.deps[self.for_machine].put(identifier, dep)
             return dep
         return None
 
@@ -217,12 +216,11 @@ def _get_cached_dep(self, name: str, kwargs: DependencyObjectKWs) -> T.Optional[
         # of None in the case the dependency is cached as not-found, or if cached
         # version does not match. In that case we don't want to continue with
         # other candidates.
-        for_machine = kwargs.get('native', MachineChoice.HOST)
         identifier = dependencies.get_dep_identifier(name, kwargs)
         wanted_vers = stringlistify(kwargs.get('version', []))
 
         info: mlog.TV_LoggableList = [mlog.blue('(cached)')]
-        override = self.build.dependency_overrides[for_machine].get(identifier)
+        override = self.build.dependency_overrides[self.for_machine].get(identifier)
         if override:
             if override.explicit:
                 info = [mlog.blue('(overridden)')]
@@ -236,7 +234,7 @@ def _get_cached_dep(self, name: str, kwargs: DependencyObjectKWs) -> T.Optional[
         elif self.forcefallback and self.subproject_name:
             cached_dep = None
         else:
-            cached_dep = self.coredata.deps[for_machine].get(identifier)
+            cached_dep = self.coredata.deps[self.for_machine].get(identifier)
 
         if cached_dep:
             found_vers = cached_dep.get_version()
@@ -372,10 +370,9 @@ def lookup(self, kwargs: DependencyObjectKWs, force_fallback: bool = False) -> D
                 # Override this dependency to have consistent results in subsequent
                 # dependency lookups.
                 for name in self.names:
-                    for_machine = kwargs.get('native', MachineChoice.HOST)
                     identifier = dependencies.get_dep_identifier(name, kwargs)
-                    if identifier not in self.build.dependency_overrides[for_machine]:
-                        self.build.dependency_overrides[for_machine][identifier] = \
+                    if identifier not in self.build.dependency_overrides[self.for_machine]:
+                        self.build.dependency_overrides[self.for_machine][identifier] = \
                             build.DependencyOverride(dep, self.interpreter.current_node, explicit=False)
                 return dep
             elif required and (dep or i == last):

mesonbuild/interpreter/interpreter.py

@@ -573,7 +573,7 @@ def check_stdlibs(self) -> None:
                     FeatureNew.single_use('stdlib without variable name', '0.56.0', self.subproject, location=self.current_node)
                 kwargs: dependencies.base.DependencyObjectKWs = {'native': for_machine}
                 name = l + '_stdlib'
-                df = DependencyFallbacksHolder(self, [name])
+                df = DependencyFallbacksHolder(self, [name], for_machine)
                 df.set_fallback(di)
                 dep = df.lookup(kwargs, force_fallback=True)
                 self.build.stdlibs[for_machine][l] = dep
@@ -1768,7 +1768,7 @@ def func_dependency(self, node: mparser.BaseNode, args: T.Tuple[T.List[str]], kw
             FeatureNew('dependency with more than one name', '0.60.0').use(self.subproject)
         default_options = kwargs.get('default_options')
         for_machine = kwargs['native']
-        df = DependencyFallbacksHolder(self, names, kwargs['allow_fallback'], default_options)
+        df = DependencyFallbacksHolder(self, names, for_machine, kwargs['allow_fallback'], default_options)
         df.set_fallback(kwargs['fallback'])
         not_found_message = kwargs['not_found_message']