compilers: Remove Environment parameter from Compiler.alignment

This also fixes the helper `_cross_alignment` method.

3 files changed, 11 insertions, 11 deletions

diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 0cf711514..1384ac0f8 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -737,7 +737,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta):
                dependencies: T.Optional[T.List['Dependency']] = None) -> T.Tuple[int, bool]:
         raise EnvironmentException('Language %s does not support sizeof checks.' % self.get_display_language())
 
-    def alignment(self, typename: str, prefix: str, env: 'Environment', *,
+    def alignment(self, typename: str, prefix: str, *,
                   extra_args: T.Optional[T.List[str]] = None,
                   dependencies: T.Optional[T.List['Dependency']] = None) -> T.Tuple[int, bool]:
         raise EnvironmentException('Language %s does not support alignment checks.' % self.get_display_language())
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py
index 4e31ded83..6a09f0d01 100644
--- a/mesonbuild/compilers/d.py
+++ b/mesonbuild/compilers/d.py
@@ -595,7 +595,7 @@ class DCompiler(Compiler):
             raise mesonlib.EnvironmentException('Could not run sizeof test binary.')
         return int(res.stdout), res.cached
 
-    def alignment(self, typename: str, prefix: str, env: 'Environment', *,
+    def alignment(self, typename: str, prefix: str, *,
                   extra_args: T.Optional[T.List[str]] = None,
                   dependencies: T.Optional[T.List['Dependency']] = None) -> T.Tuple[int, bool]:
         if extra_args is None:
@@ -607,7 +607,7 @@ class DCompiler(Compiler):
             writeln(({typename}).alignof);
         }}
         '''
-        res = self.run(t, env, extra_args=extra_args,
+        res = self.run(t, self.environment, extra_args=extra_args,
                        dependencies=dependencies)
         if not res.compiled:
             raise mesonlib.EnvironmentException('Could not compile alignment test.')
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
index 577248bc2..2127c19c8 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
@@ -577,9 +577,9 @@ class CLikeCompiler(Compiler):
             raise mesonlib.EnvironmentException('Could not run sizeof test binary.')
         return int(res.stdout), res.cached
 
-    def cross_alignment(self, typename: str, prefix: str, env: 'Environment', *,
-                        extra_args: T.Optional[T.List[str]] = None,
-                        dependencies: T.Optional[T.List['Dependency']] = None) -> int:
+    def _cross_alignment(self, typename: str, prefix: str, *,
+                         extra_args: T.Optional[T.List[str]] = None,
+                         dependencies: T.Optional[T.List['Dependency']] = None) -> int:
         if extra_args is None:
             extra_args = []
         t = f'''{prefix}
@@ -597,16 +597,16 @@ class CLikeCompiler(Compiler):
             char c;
             {typename} target;
         }};'''
-        return self.cross_compute_int('offsetof(struct tmp, target)', None, None, None, t, env, extra_args, dependencies)
+        return self.cross_compute_int('offsetof(struct tmp, target)', None, None, None, t, self.environment, extra_args, dependencies)
 
-    def alignment(self, typename: str, prefix: str, env: 'Environment', *,
+    def alignment(self, typename: str, prefix: str, *,
                   extra_args: T.Optional[T.List[str]] = None,
                   dependencies: T.Optional[T.List['Dependency']] = None) -> T.Tuple[int, bool]:
         if extra_args is None:
             extra_args = []
         if self.is_cross:
-            r = self.cross_alignment(typename, prefix, env, extra_args=extra_args,
-                                     dependencies=dependencies)
+            r = self._cross_alignment(typename, prefix, extra_args=extra_args,
+                                      dependencies=dependencies)
             return r, False
         t = f'''{prefix}
         #include <stdio.h>
@@ -619,7 +619,7 @@ class CLikeCompiler(Compiler):
             printf("%d", (int)offsetof(struct tmp, target));
             return 0;
         }}'''
-        res = self.cached_run(t, env, extra_args=extra_args,
+        res = self.cached_run(t, self.environment, extra_args=extra_args,
                               dependencies=dependencies)
         if not res.compiled:
             raise mesonlib.EnvironmentException('Could not compile alignment test.')