Revert "Add thinlto support. Closes #7493."

This reverts commit 3e6fbde94c.

docs/markdown/snippets/thinlto.md

@@ -1,27 +0,0 @@
-## Add support for thin LTO
-
-The `b_lto` option has been updated and now can be set to the value
-`thin`. This enables [thin
-LTO](https://clang.llvm.org/docs/ThinLTO.html) on all compilers where
-it is supported. At the time of writing this means only Clang.
-
-This change is potentially backwards incompatible. If you have
-examined the value of `b_lto` in your build file, note that its type
-has changed from a boolean to a string. Thus comparisons like this:
-
-```meson
-if get_option('b_lto')
-...
-endif
-```
-
-need to be changed to something like this instead:
-
-```meson
-if get_option('b_lto') == 'true'
-...
-endif
-```
-
-This should not affect any command line invocations as configuring LTO
-with `-Db_lto=true` still works and behaves the same way as before.

mesonbuild/compilers/compilers.py

@@ -266,9 +266,7 @@ clike_debug_args = {False: [],
                     True: ['-g']}  # type: T.Dict[bool, T.List[str]]
 
 base_options = {'b_pch': coredata.UserBooleanOption('Use precompiled headers', True),
-                'b_lto': coredata.UserComboOption('Use link time optimization',
+                'b_lto': coredata.UserBooleanOption('Use link time optimization', False),
-                                                  ['false', 'true', 'thin'],
-                                                  'false'),
                 'b_sanitize': coredata.UserComboOption('Code sanitizer to use',
                                                        ['none', 'address', 'thread', 'undefined', 'memory', 'address,undefined'],
                                                        'none'),
@@ -309,7 +307,8 @@ def option_enabled(boptions: T.List[str], options: 'OptionDictType',
 def get_base_compile_args(options: 'OptionDictType', compiler: 'Compiler') -> T.List[str]:
     args = []  # type T.List[str]
     try:
-        args.extend(compiler.get_lto_compile_args(options['b_lto'].value))
+        if options['b_lto'].value:
+            args.extend(compiler.get_lto_compile_args())
     except KeyError:
         pass
     try:
@@ -358,7 +357,8 @@ def get_base_link_args(options: 'OptionDictType', linker: 'Compiler',
                        is_shared_module: bool) -> T.List[str]:
     args = []  # type: T.List[str]
     try:
-        args.extend(linker.get_lto_link_args(options['b_lto'].value))
+        if options['b_lto'].value:
+            args.extend(linker.get_lto_link_args())
     except KeyError:
         pass
     try:
@@ -940,11 +940,11 @@ class Compiler(metaclass=abc.ABCMeta):
             ret.append(arg)
         return ret
 
-    def get_lto_compile_args(self, lto_type: str) -> T.List[str]:
+    def get_lto_compile_args(self) -> T.List[str]:
         return []
 
-    def get_lto_link_args(self, lto_type: str) -> T.List[str]:
+    def get_lto_link_args(self) -> T.List[str]:
-        return self.linker.get_lto_args(lto_type)
+        return self.linker.get_lto_args()
 
     def sanitizer_compile_args(self, value: str) -> T.List[str]:
         return []

mesonbuild/compilers/mixins/clang.py

@@ -77,13 +77,6 @@ class ClangCompiler(GnuLikeCompiler):
         # so it might change semantics at any time.
         return ['-include-pch', os.path.join(pch_dir, self.get_pch_name(header))]
 
-    def get_lto_compile_args(self, lto_type: str) -> T.List[str]:
-        if lto_type == 'thin':
-            return ['-flto=thin']
-        if lto_type == 'true':
-            return ['-flto']
-        return []
-
     def get_compiler_check_args(self, mode: CompileCheckMode) -> T.List[str]:
         myargs = []  # type: T.List[str]
         if mode is CompileCheckMode.COMPILE:

mesonbuild/compilers/mixins/gnu.py

@@ -295,10 +295,8 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta):
                 return self._split_fetch_real_dirs(line.split('=', 1)[1])
         return []
 
-    def get_lto_compile_args(self, lto_type: str) -> T.List[str]:
+    def get_lto_compile_args(self) -> T.List[str]:
-        if lto_type != 'false':
+        return ['-flto']
-            return ['-flto']
-        return []
 
     def sanitizer_compile_args(self, value: str) -> T.List[str]:
         if value == 'none':

mesonbuild/compilers/mixins/islinker.py

@@ -48,7 +48,7 @@ class BasicLinkerIsCompilerMixin(Compiler):
     def sanitizer_link_args(self, value: str) -> T.List[str]:
         return []
 
-    def get_lto_link_args(self, lto_type: str) -> T.List[str]:
+    def get_lto_link_args(self) -> T.List[str]:
         return []
 
     def can_linker_accept_rsp(self) -> bool:

mesonbuild/linkers.py

@@ -411,7 +411,7 @@ class DynamicLinker(LinkerEnvVarsMixin, metaclass=abc.ABCMeta):
         m = 'Linker {} does not support position-independent executable'
         raise mesonlib.EnvironmentException(m.format(self.id))
 
-    def get_lto_args(self, lto_type: str) -> T.List[str]:
+    def get_lto_args(self) -> T.List[str]:
         return []
 
     def sanitizer_args(self, value: str) -> T.List[str]:
@@ -550,10 +550,8 @@ class GnuLikeDynamicLinkerMixin:
     def get_allow_undefined_args(self) -> T.List[str]:
         return self._apply_prefix('--allow-shlib-undefined')
 
-    def get_lto_args(self, lto_type: str) -> T.List[str]:
+    def get_lto_args(self) -> T.List[str]:
-        if lto_type != 'false':
+        return ['-flto']
-            return ['-flto']
-        return []
 
     def sanitizer_args(self, value: str) -> T.List[str]:
         if value == 'none':

test cases/common/41 options/meson.build

@@ -18,7 +18,7 @@ if get_option('array_opt') != ['one', 'two']
 endif
 
 # If the default changes, update test cases/unit/13 reconfigure
-if get_option('b_lto') != 'false'
+if get_option('b_lto') != false
   error('Incorrect value in base option.')
 endif