msetup, options: reverse direction of unknown options check

Remove knowledge of the internal pending_options from msetup;
operate on the command line and check against the option store.

Signed-off-by: Paolo Bonzini <[email protected]>

Author: bonzini

mesonbuild/msetup.py

@@ -194,16 +194,21 @@ def generate(self, capture: bool = False, vslite_ctx: T.Optional[dict] = None) -
             return self._generate(env, capture, vslite_ctx)
 
     def check_unused_options(self, coredata: 'coredata.CoreData', cmd_line_options: T.Dict[OptionKey, str], all_subprojects: T.Mapping[str, object]) -> None:
-        pending = coredata.optstore.pending_options
         errlist: T.List[str] = []
         known_subprojects = all_subprojects.keys()
-        for opt in pending:
-            # It is not an error to set wrong option for unknown subprojects
-            # because they might be used in future reconfigurations
-            if coredata.optstore.accept_as_pending_option(opt, known_subprojects):
+        for opt in cmd_line_options:
+            # Accept options that exist or could appear in subsequent reconfigurations,
+            # including options for subprojects that were not used
+            if opt in coredata.optstore or \
+                    opt.evolve(subproject=None) in coredata.optstore or \
+                    coredata.optstore.accept_as_pending_option(opt):
                 continue
-            if opt in cmd_line_options:
-                errlist.append(f'"{opt}"')
+            if opt.subproject and opt.subproject not in known_subprojects:
+                continue
+            # "foo=true" may also refer to toplevel project option ":foo"
+            if opt.subproject is None and coredata.optstore.is_project_option(opt.as_root()):
+                continue
+            errlist.append(f'"{opt}"')
         if errlist:
             errstr = ', '.join(errlist)
             raise MesonException(f'Unknown options: {errstr}')

mesonbuild/options.py

@@ -1332,16 +1332,9 @@ def initialize_from_top_level_project_call(self,
             if not key.subproject:
                 self.set_option_maybe_root(key, valstr, True)
 
-    def accept_as_pending_option(self, key: OptionKey, known_subprojects: T.Optional[T.Container[str]] = None,
-                                 first_invocation: bool = False) -> bool:
-        # Fail on unknown options that we can know must exist at this point in time.
-        # Subproject and compiler options are resolved later.
-        #
+    def accept_as_pending_option(self, key: OptionKey, first_invocation: bool = False) -> bool:
         # Some base options (sanitizers etc) might get added later.
         # Permitting them all is not strictly correct.
-        if key.subproject:
-            if known_subprojects is None or key.subproject not in known_subprojects:
-                return True
         if self.is_compiler_option(key):
             return True
         if first_invocation and self.is_backend_option(key):

unittests/optiontests.py

@@ -227,19 +227,13 @@ def test_b_nonexistent(self):
     def test_backend_option_pending(self):
         optstore = OptionStore(False)
         # backend options are known after the first invocation
-        self.assertTrue(optstore.accept_as_pending_option(OptionKey('backend_whatever'), set(), True))
-        self.assertFalse(optstore.accept_as_pending_option(OptionKey('backend_whatever'), set(), False))
+        self.assertTrue(optstore.accept_as_pending_option(OptionKey('backend_whatever'), True))
+        self.assertFalse(optstore.accept_as_pending_option(OptionKey('backend_whatever'), False))
 
     def test_reconfigure_b_nonexistent(self):
         optstore = OptionStore(False)
         optstore.set_from_configure_command(['b_ndebug=true'], [])
 
-    def test_subproject_nonexistent(self):
-        optstore = OptionStore(False)
-        subprojects = {'found'}
-        self.assertFalse(optstore.accept_as_pending_option(OptionKey('foo', subproject='found'), subprojects))
-        self.assertTrue(optstore.accept_as_pending_option(OptionKey('foo', subproject='whatisthis'), subprojects))
-
     def test_subproject_proj_opt_with_same_name(self):
         name = 'tests'
         subp = 'subp'