introspection: do not reinvent process_compiler_options

Let add_compiler_options and process_compiler_options handle subprojects,
and also run it for the main project to ensure that pending_options are
properly processed.

This exposes a bug because "comp" could have been None, so fix that.

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

1 files changed, 2 insertions, 8 deletions

diff --git a/mesonbuild/ast/introspection.py b/mesonbuild/ast/introspection.py
index bb1e241e5..f63af8425 100644
--- a/mesonbuild/ast/introspection.py
+++ b/mesonbuild/ast/introspection.py
@@ -6,7 +6,6 @@
 # or an interpreter-based tool
 
 from __future__ import annotations
-import copy
 import os
 import typing as T
 
@@ -205,13 +204,8 @@ class IntrospectionInterpreter(AstInterpreter):
                         raise
                     else:
                         continue
-                if self.subproject:
-                    options = {}
-                    for k in comp.get_options():
-                        v = copy.copy(self.coredata.optstore.get_value_object(k))
-                        k = k.evolve(subproject=self.subproject)
-                        options[k] = v
-                    self.coredata.add_compiler_options(options, lang, for_machine, self.environment, self.subproject)
+                if comp:
+                    self.coredata.process_compiler_options(lang, comp, self.environment, self.subproject)
 
     def func_dependency(self, node: BaseNode, args: T.List[TYPE_var], kwargs: T.Dict[str, TYPE_var]) -> None:
         args = self.flatten_args(args)