options: replace all uses of get_value with get_value_for*

This was an unsafe version of the other function, but without proper
subproject handling. In most cases (except unittests) the safe variant
was actually better anyway, especially with the fallback parameter

Author: dcbaker

mesonbuild/backend/ninjabackend.py

@@ -3827,8 +3827,7 @@ def generate_clangtool(self, name: str, extra_arg: T.Optional[str] = None, need_
         if extra_arg:
             target_name += f'-{extra_arg}'
             extra_args.append(f'--{extra_arg}')
-        colorout = self.environment.coredata.optstore.get_value('b_colorout') \
-            if OptionKey('b_colorout') in self.environment.coredata.optstore else 'always'
+        colorout = self.environment.coredata.optstore.get_value_for(OptionKey('b_colorout'), str, fallback='always')
         extra_args.extend(['--color', colorout])
         if not os.path.exists(os.path.join(self.environment.source_dir, '.clang-' + name)) and \
                 not os.path.exists(os.path.join(self.environment.source_dir, '_clang-' + name)):

mesonbuild/backend/vs2010backend.py

@@ -531,7 +531,7 @@ def generate_solution(self, sln_filename: str, projlist: T.List[Project]) -> Non
         replace_if_different(sln_filename, sln_filename_tmp)
 
     def generate_projects(self, vslite_ctx: dict = None) -> T.List[Project]:
-        startup_project = self.environment.coredata.optstore.get_value('backend_startup_project')
+        startup_project = self.environment.coredata.optstore.get_value_for(OptionKey('backend_startup_project'), str)
         projlist: T.List[Project] = []
         startup_idx = 0
         for (i, (name, target)) in enumerate(self.build.targets.items()):

mesonbuild/compilers/mixins/emscripten.py

@@ -50,8 +50,7 @@ def _get_compile_output(self, dirname: str, mode: CompileCheckMode) -> str:
 
     def thread_link_flags(self, env: 'Environment') -> T.List[str]:
         args = ['-pthread']
-        count = env.coredata.optstore.get_value(OptionKey(f'{self.language}_thread_count', machine=self.for_machine))
-        assert isinstance(count, int)
+        count = env.coredata.optstore.get_value_for(OptionKey(f'{self.language}_thread_count', machine=self.for_machine), int)
         if count:
             args.append(f'-sPTHREAD_POOL_SIZE={count}')
         return args

mesonbuild/coredata.py

@@ -478,7 +478,7 @@ def _set_others_from_buildtype(self, value: str) -> bool:
     def get_external_args(self, for_machine: MachineChoice, lang: str) -> T.List[str]:
         # mypy cannot analyze type of OptionKey
         key = OptionKey(f'{lang}_args', machine=for_machine)
-        return T.cast('T.List[str]', self.optstore.get_value(key))
+        return self.optstore.get_value_for(key, list)
 
     @lru_cache(maxsize=None)
     def get_external_link_args(self, for_machine: MachineChoice, lang: str) -> T.List[str]:
@@ -589,7 +589,7 @@ def process_compiler_options(self, lang: str, comp: Compiler, subproject: str) -
 
     def emit_base_options_warnings(self) -> None:
         bcodekey = OptionKey('b_bitcode')
-        if bcodekey in self.optstore and self.optstore.get_value(bcodekey):
+        if bcodekey in self.optstore and self.optstore.get_value_for(bcodekey, bool):
             msg = textwrap.dedent('''Base option 'b_bitcode' is enabled, which is incompatible with many linker options.
                                      Incompatible options such as \'b_asneeded\' have been disabled.'
                                      Please see https://mesonbuild.com/Builtin-options.html#Notes_about_Apple_Bitcode_support for more details.''')

mesonbuild/dependencies/pkgconfig.py

@@ -419,7 +419,7 @@ def _search_libs(self, libs_in: ImmutableListProtocol[str], raw_libs_in: Immutab
         #
         # Only prefix_libpaths are reordered here because there should not be
         # too many system_libpaths to cause library version issues.
-        pkg_config_path: T.List[str] = self.env.coredata.optstore.get_value(OptionKey('pkg_config_path', machine=self.for_machine)) # type: ignore[assignment]
+        pkg_config_path = self.env.coredata.optstore.get_value_for(OptionKey('pkg_config_path', machine=self.for_machine), list)
         pkg_config_path = self._convert_mingw_paths(pkg_config_path)
         prefix_libpaths = OrderedSet(sort_libpaths(list(prefix_libpaths), pkg_config_path))
         system_libpaths: OrderedSet[str] = OrderedSet()

mesonbuild/dependencies/python.py

@@ -249,10 +249,9 @@ def get_windows_link_args(self, limited_api: bool) -> T.Optional[T.List[str]]:
                     # `debugoptimized` buildtype may not set debug=True currently, see gh-11645
                     is_debug_build = debug or buildtype == 'debug'
                     vscrt_debug = False
-                    if OptionKey('b_vscrt') in self.env.coredata.optstore:
-                        vscrt = self.env.coredata.optstore.get_value('b_vscrt')
-                        if vscrt in {'mdd', 'mtd', 'from_buildtype', 'static_from_buildtype'}:
-                            vscrt_debug = True
+                    vscrt = self.env.coredata.optstore.get_value_for(OptionKey('b_vscrt'), str, fallback='meson-sentinel')
+                    if vscrt in {'mdd', 'mtd', 'from_buildtype', 'static_from_buildtype'}:
+                        vscrt_debug = True
                     if is_debug_build and vscrt_debug and not self.variables.get('Py_DEBUG'):
                         mlog.warning(textwrap.dedent('''\
                             Using a debug build type with MSVC or an MSVC-compatible compiler

mesonbuild/interpreter/interpreter.py

@@ -3059,18 +3059,14 @@ def print_extra_warnings(self) -> None:
                 break
 
     def check_clang_asan_lundef(self) -> None:
-        if OptionKey('b_lundef') not in self.coredata.optstore:
-            return
-        if OptionKey('b_sanitize') not in self.coredata.optstore:
-            return
-        if (self.coredata.optstore.get_value('b_lundef') and
-                self.coredata.optstore.get_value('b_sanitize')):
-            value = self.coredata.optstore.get_value('b_sanitize')
-            mlog.warning(textwrap.dedent(f'''\
-                    Trying to use {value} sanitizer on Clang with b_lundef.
-                    This will probably not work.
-                    Try setting b_lundef to false instead.'''),
-                location=self.current_node)  # noqa: E128
+        if self.coredata.optstore.get_value_for(OptionKey('b_lundef'), bool, fallback=False):
+            value = self.coredata.optstore.get_value_for(OptionKey('b_sanitize'), list, fallback=[])
+            if value:
+                mlog.warning(textwrap.dedent(f'''\
+                        Trying to use {value} sanitizer on Clang with b_lundef.
+                        This will probably not work.
+                        Try setting b_lundef to false instead.'''),
+                    location=self.current_node)  # noqa: E128
 
     # Check that the indicated file is within the same subproject
     # as we currently are. This is to stop people doing

mesonbuild/modules/gnome.py

@@ -910,9 +910,8 @@ def _get_langs_compilers_flags(state: 'ModuleState', langs_compilers: T.List[T.T
                 cflags += state.global_args[lang]
             if state.project_args.get(lang):
                 cflags += state.project_args[lang]
-            if OptionKey('b_sanitize') in compiler.base_options:
-                sanitize = state.environment.coredata.optstore.get_value('b_sanitize')
-                assert isinstance(sanitize, list)
+            sanitize = state.environment.coredata.optstore.get_value_for(OptionKey('b_sanitize'), list, fallback=[])
+            if sanitize:
                 cflags += compiler.sanitizer_compile_args(sanitize)
                 # These must be first in ldflags
                 if 'address' in sanitize:

mesonbuild/modules/python.py

@@ -207,7 +207,7 @@ def extension_module_method(self, args: T.Tuple[str, T.List[BuildTargetSource]],
 
                 new_link_args = mesonlib.extract_as_list(kwargs, 'link_args')
 
-                is_debug = self.interpreter.environment.coredata.optstore.get_value('debug')
+                is_debug = self.interpreter.environment.coredata.optstore.get_value_for(OptionKey('debug'), bool)
                 if is_debug:
                     new_link_args.append(python_windows_debug_link_exception)
                 else:

mesonbuild/modules/rust.py

@@ -21,6 +21,7 @@
 from ..interpreterbase import ContainerTypeInfo, InterpreterException, KwargInfo, typed_kwargs, typed_pos_args, noPosargs, permittedKwargs
 from ..interpreter.interpreterobjects import Doctest
 from ..mesonlib import File, MesonException, PerMachine
+from ..options import OptionKey
 from ..programs import ExternalProgram, NonExistingExternalProgram
 
 if T.TYPE_CHECKING:
@@ -439,8 +440,7 @@ def bindgen(self, state: ModuleState, args: T.List, kwargs: FuncBindgen) -> Modu
         if self._bindgen_rust_target and '--rust-target' not in cmd:
             cmd.extend(['--rust-target', self._bindgen_rust_target])
         if self._bindgen_set_std and '--rust-edition' not in cmd:
-            rust_std = state.environment.coredata.optstore.get_value('rust_std')
-            assert isinstance(rust_std, str), 'for mypy'
+            rust_std = state.environment.coredata.optstore.get_value_for(OptionKey('rust_std'), str)
             if rust_std != 'none':
                 cmd.extend(['--rust-edition', rust_std])
         cmd.append('--')

mesonbuild/options.py

@@ -846,9 +846,6 @@ def get_pending_value(self, key: T.Union[OptionKey, str], default: T.Optional[El
             return self.options[key].value
         return self.pending_options.get(key, default)
 
-    def get_value(self, key: T.Union[OptionKey, str]) -> ElementaryOptionValues:
-        return self.get_value_object(key).value
-
     def __len__(self) -> int:
         return len(self.options)
 
@@ -1161,7 +1158,7 @@ def get_default_for_b_option(self, key: OptionKey) -> ElementaryOptionValues:
         assert self.is_base_option(key)
         try:
             return T.cast('ElementaryOptionValues', COMPILER_BASE_OPTIONS[key.evolve(subproject=None)].default)
-        except KeyErrorexcept Key:
+        except KeyError:
             raise MesonBugException(f'Requested base option {key} which does not exist.')
 
     def remove(self, key: OptionKey) -> None:

unittests/allplatformstests.py

@@ -2677,35 +2677,35 @@ def test_command_line(self):
         out = self.init(testdir, extra_args=['--profile-self', '--fatal-meson-warnings'])
         self.assertNotIn('[default: true]', out)
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('default_library'), 'static')
-        self.assertEqual(obj.optstore.get_value('warning_level'), '1')
-        self.assertEqual(obj.optstore.get_value(OptionKey('set_sub_opt', '')), True)
-        self.assertEqual(obj.optstore.get_value(OptionKey('subp_opt', 'subp')), 'default3')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('default_library'), 'static')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), '1')
+        self.assertEqual(obj.optstore.get_value_for_unsafe(OptionKey('set_sub_opt', '')), True)
+        self.assertEqual(obj.optstore.get_value_for_unsafe(OptionKey('subp_opt', 'subp')), 'default3')
         self.wipe()
 
         # warning_level is special, it's --warnlevel instead of --warning-level
         # for historical reasons
         self.init(testdir, extra_args=['--warnlevel=2', '--fatal-meson-warnings'])
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('warning_level'), '2')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), '2')
         self.setconf('--warnlevel=3')
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('warning_level'), '3')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), '3')
         self.setconf('--warnlevel=everything')
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('warning_level'), 'everything')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), 'everything')
         self.wipe()
 
         # But when using -D syntax, it should be 'warning_level'
         self.init(testdir, extra_args=['-Dwarning_level=2', '--fatal-meson-warnings'])
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('warning_level'), '2')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), '2')
         self.setconf('-Dwarning_level=3')
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('warning_level'), '3')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), '3')
         self.setconf('-Dwarning_level=everything')
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('warning_level'), 'everything')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), 'everything')
         self.wipe()
 
         # Mixing --option and -Doption is forbidden
@@ -2729,15 +2729,15 @@ def test_command_line(self):
         # --default-library should override default value from project()
         self.init(testdir, extra_args=['--default-library=both', '--fatal-meson-warnings'])
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('default_library'), 'both')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('default_library'), 'both')
         self.setconf('--default-library=shared')
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('default_library'), 'shared')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('default_library'), 'shared')
         if self.backend is Backend.ninja:
             # reconfigure target works only with ninja backend
             self.build('reconfigure')
             obj = mesonbuild.coredata.load(self.builddir)
-            self.assertEqual(obj.optstore.get_value('default_library'), 'shared')
+            self.assertEqual(obj.optstore.get_value_for_unsafe('default_library'), 'shared')
         self.wipe()
 
         # Should fail on unknown options
@@ -2774,22 +2774,22 @@ def test_command_line(self):
         # Test we can set subproject option
         self.init(testdir, extra_args=['-Dsubp:subp_opt=foo', '--fatal-meson-warnings'])
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value(OptionKey('subp_opt', 'subp')), 'foo')
+        self.assertEqual(obj.optstore.get_value_for_unsafe(OptionKey('subp_opt', 'subp')), 'foo')
         self.wipe()
 
         # c_args value should be parsed with split_args
         self.init(testdir, extra_args=['-Dc_args=-Dfoo -Dbar "-Dthird=one two"', '--fatal-meson-warnings'])
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value(OptionKey('c_args')), ['-Dfoo', '-Dbar', '-Dthird=one two'])
+        self.assertEqual(obj.optstore.get_value_for_unsafe(OptionKey('c_args')), ['-Dfoo', '-Dbar', '-Dthird=one two'])
 
         self.setconf('-Dc_args="foo bar" one two')
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value(OptionKey('c_args')), ['foo bar', 'one', 'two'])
+        self.assertEqual(obj.optstore.get_value_for_unsafe(OptionKey('c_args')), ['foo bar', 'one', 'two'])
         self.wipe()
 
         self.init(testdir, extra_args=['-Dset_percent_opt=myoption%', '--fatal-meson-warnings'])
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value(OptionKey('set_percent_opt', '')), 'myoption%')
+        self.assertEqual(obj.optstore.get_value_for_unsafe(OptionKey('set_percent_opt', '')), 'myoption%')
         self.wipe()
 
         # Setting a 2nd time the same option should override the first value
@@ -2800,19 +2800,19 @@ def test_command_line(self):
                                            '-Dc_args=-Dfoo', '-Dc_args=-Dbar',
                                            '-Db_lundef=false', '--fatal-meson-warnings'])
             obj = mesonbuild.coredata.load(self.builddir)
-            self.assertEqual(obj.optstore.get_value('bindir'), 'bar')
-            self.assertEqual(obj.optstore.get_value('buildtype'), 'release')
-            self.assertEqual(obj.optstore.get_value('b_sanitize'), ['thread'])
-            self.assertEqual(obj.optstore.get_value(OptionKey('c_args')), ['-Dbar'])
+            self.assertEqual(obj.optstore.get_value_for_unsafe('bindir'), 'bar')
+            self.assertEqual(obj.optstore.get_value_for_unsafe('buildtype'), 'release')
+            self.assertEqual(obj.optstore.get_value_for_unsafe('b_sanitize'), ['thread'])
+            self.assertEqual(obj.optstore.get_value_for_unsafe(OptionKey('c_args')), ['-Dbar'])
             self.setconf(['--bindir=bar', '--bindir=foo',
                           '-Dbuildtype=release', '-Dbuildtype=plain',
                           '-Db_sanitize=thread', '-Db_sanitize=address',
                           '-Dc_args=-Dbar', '-Dc_args=-Dfoo'])
             obj = mesonbuild.coredata.load(self.builddir)
-            self.assertEqual(obj.optstore.get_value('bindir'), 'foo')
-            self.assertEqual(obj.optstore.get_value('buildtype'), 'plain')
-            self.assertEqual(obj.optstore.get_value('b_sanitize'), ['address'])
-            self.assertEqual(obj.optstore.get_value(OptionKey('c_args')), ['-Dfoo'])
+            self.assertEqual(obj.optstore.get_value_for_unsafe('bindir'), 'foo')
+            self.assertEqual(obj.optstore.get_value_for_unsafe('buildtype'), 'plain')
+            self.assertEqual(obj.optstore.get_value_for_unsafe('b_sanitize'), ['address'])
+            self.assertEqual(obj.optstore.get_value_for_unsafe(OptionKey('c_args')), ['-Dfoo'])
             self.wipe()
         except KeyError:
             # Ignore KeyError, it happens on CI for compilers that does not
@@ -2826,25 +2826,25 @@ def test_warning_level_0(self):
         # Verify default values when passing no args
         self.init(testdir)
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('warning_level'), '0')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), '0')
         self.wipe()
 
         # verify we can override w/ --warnlevel
         self.init(testdir, extra_args=['--warnlevel=1'])
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('warning_level'), '1')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), '1')
         self.setconf('--warnlevel=0')
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('warning_level'), '0')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), '0')
         self.wipe()
 
         # verify we can override w/ -Dwarning_level
         self.init(testdir, extra_args=['-Dwarning_level=1'])
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('warning_level'), '1')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), '1')
         self.setconf('-Dwarning_level=0')
         obj = mesonbuild.coredata.load(self.builddir)
-        self.assertEqual(obj.optstore.get_value('warning_level'), '0')
+        self.assertEqual(obj.optstore.get_value_for_unsafe('warning_level'), '0')
         self.wipe()
 
     def test_feature_check_usage_subprojects(self):

unittests/datatests.py

@@ -168,9 +168,9 @@ def remove_module_name(key: OptionKey) -> OptionKey:
             else:
                 raise RuntimeError(f'Invalid debug value {debug!r} in row:\n{m.group()}')
             env.coredata.set_option(OptionKey('buildtype'), buildtype)
-            self.assertEqual(env.coredata.optstore.get_value('buildtype'), buildtype)
-            self.assertEqual(env.coredata.optstore.get_value('optimization'), opt)
-            self.assertEqual(env.coredata.optstore.get_value('debug'), debug)
+            self.assertEqual(env.coredata.optstore.get_value_for_unsafe('buildtype'), buildtype)
+            self.assertEqual(env.coredata.optstore.get_value_for_unsafe('optimization'), opt)
+            self.assertEqual(env.coredata.optstore.get_value_for_unsafe('debug'), debug)
 
     def test_cpu_families_documented(self):
         with open("docs/markdown/Reference-tables.md", encoding='utf-8') as f: