Fix detection of unknown base options in subproj

cc4cfbc added detection for unknown
base options, but it was not working for subproject base options. This
should fix it.

Author: bruchar1

mesonbuild/coredata.py

@@ -1009,7 +1009,7 @@ def set_default_options(self, default_options: T.MutableMapping[OptionKey, str],
             # adding languages and setting backend.
             if k.type in {OptionType.COMPILER, OptionType.BACKEND}:
                 continue
-            if k.type == OptionType.BASE and k in base_options:
+            if k.type == OptionType.BASE and k.as_root() in base_options:
                 # set_options will report unknown base options
                 continue
             options[k] = v

test cases/unit/122 reconfigure base options/meson.build

@@ -1,5 +1,7 @@
 project('reconfigure', 'c',
 default_options: ['c_std=c89'])
 
+subproject('sub')
+
 message('b_ndebug: ' + get_option('b_ndebug'))
 message('c_std: ' + get_option('c_std'))

test cases/unit/122 reconfigure base options/subprojects/sub/meson.build

@@ -0,0 +1,5 @@
+project('sub', 'c',
+default_options: ['c_std=c89'])
+
+message('b_ndebug: ' + get_option('b_ndebug'))
+message('c_std: ' + get_option('c_std'))

unittests/platformagnostictests.py

@@ -282,7 +282,7 @@ def test_reconfigure_base_options(self):
         self.assertIn('\nMessage: b_ndebug: true\n', out)
         self.assertIn('\nMessage: c_std: c89\n', out)
 
-        out = self.init(testdir, extra_args=['--reconfigure', '-Db_ndebug=if-release', '-Dc_std=c99'])
+        out = self.init(testdir, extra_args=['--reconfigure', '-Db_ndebug=if-release', '-Dsub:b_ndebug=false', '-Dc_std=c99'])
         self.assertIn('\nMessage: b_ndebug: if-release\n', out)
         self.assertIn('\nMessage: c_std: c99\n', out)