Support lists for ObjC and ObjC++ standards #13642

dcbaker · 2024-09-06T17:15:46Z

Also, share the implementations between the C and ObjC, and C++ and OjbC++ instance of both Clang and GNU compilers, so that we update once, and only once for each compiler.

Mostly this just ends up moving code around.

Fixes: #13639

dcbaker · 2024-09-06T17:17:18Z

I have tested this with Clang and with GCC, but only far enough with GCC to get to the point it fails because my GCC build doesn't have ObjC[++] support.

mesonbuild/compilers/c.py

-
-
-class ClangCCompiler(_ClangCStds, ClangCompiler, CCompiler):
+class ClangCCompiler(ClangCStds, ClangCompiler, CCompiler):


mesonbuild/compilers/c.py

@@ -268,11 +235,8 @@
        return []


-class GnuCCompiler(GnuCompiler, CCompiler):
+class GnuCCompiler(GnuCStds, GnuCompiler, CCompiler):


mesonbuild/compilers/c.py

mesonbuild/compilers/cpp.py

@@ -423,7 +413,7 @@
        return []


-class GnuCPPCompiler(_StdCPPLibMixin, GnuCompiler, CPPCompiler):
+class GnuCPPCompiler(_StdCPPLibMixin, GnuCPPStds, GnuCompiler, CPPCompiler):


mesonbuild/compilers/objc.py


-class GnuObjCCompiler(GnuCompiler, ObjCCompiler):
+class GnuObjCCompiler(GnuCStds, GnuCompiler, ObjCCompiler):


mesonbuild/compilers/objc.py


-class ClangObjCCompiler(ClangCompiler, ObjCCompiler):
+class ClangObjCCompiler(ClangCStds, ClangCompiler, ObjCCompiler):


mesonbuild/compilers/objcpp.py


-class GnuObjCPPCompiler(GnuCompiler, ObjCPPCompiler):
+
+class GnuObjCPPCompiler(GnuCPPStds, GnuCompiler, ObjCPPCompiler):


mesonbuild/compilers/objcpp.py


-class ClangObjCPPCompiler(ClangCompiler, ObjCPPCompiler):
+
+class ClangObjCPPCompiler(ClangCPPStds, ClangCompiler, ObjCPPCompiler):


bruchar1 · 2024-09-06T19:03:46Z

Should there be a test for that, to ensure every compiler supports the same syntax for std option?

dcbaker · 2024-09-12T16:48:52Z

It was worth writing the tests, I found some issues that weren't being caught by our existing tests.

mesonbuild/compilers/cpp.py

unittests/allplatformstests.py

dcbaker · 2024-09-25T16:46:42Z

Also in the latest version, use mixins for the Apple version overrides

mesonbuild/compilers/c.py

@@ -188,18 +156,14 @@
    id = 'armltdclang'


-class AppleClangCCompiler(AppleCompilerMixin, ClangCCompiler):
+class AppleClangCCompiler(AppleCompilerMixin, AppleCStdsMixin, ClangCCompiler):


mesonbuild/compilers/cpp.py

-
-    _CPP23_VERSION = '>=12.0.0'
-    _CPP26_VERSION = '>=17.0.0'
+class ClangCPPCompiler(_StdCPPLibMixin, ClangCPPStds, ClangCompiler, CPPCompiler):


mesonbuild/compilers/cpp.py

-    # TODO: We don't know which XCode version will include LLVM 17 yet, so
-    # use something absurd.
-    _CPP26_VERSION = '>=99.0.0'
+class AppleClangCPPCompiler(AppleCompilerMixin, AppleCPPStdsMixin, ClangCPPCompiler):


mesonbuild/compilers/objc.py

        if std != 'none':
            args.append('-std=' + std)
        return args

-class AppleClangObjCCompiler(ClangObjCCompiler):
+class AppleClangObjCCompiler(AppleCStdsMixin, ClangObjCCompiler):


mesonbuild/compilers/objcpp.py

        if std != 'none':
            args.append('-std=' + std)
        return args


-class AppleClangObjCPPCompiler(ClangObjCPPCompiler):
+class AppleClangObjCPPCompiler(AppleCPPStdsMixin, ClangObjCPPCompiler):


bgilbert · 2024-09-25T18:12:38Z

xref #13713: it'd be good to produce a future-feature warning if ObjC is used with a list of standards. Otherwise projects might be surprised e.g. if they use Objective C on macOS, don't CI on macOS with older Meson, and switch to c_std=gnuXX,cXX. (I tripped over this in glib, and CI caught it only because this PR hasn't shipped.)

dcbaker · 2024-09-25T19:33:25Z

@bgilbert given that this series is already up to 13 patches and is fixing tons of issues with ObjC, I'd prefer to handle that separately, but I assigned that to myself and I'll have a look it at.

mesonbuild/compilers/c.py

@@ -10,18 +11,18 @@
 from .. import mlog
 from ..mesonlib import MesonException, version_compare
 from .c_function_attributes import C_FUNC_ATTRIBUTES
-from .mixins.apple import AppleCompilerMixin
+from .mixins.apple import AppleCompilerMixin, AppleCStdsMixin


mesonbuild/compilers/c.py

@@ -10,18 +11,18 @@
 from .. import mlog
 from ..mesonlib import MesonException, version_compare
 from .c_function_attributes import C_FUNC_ATTRIBUTES
-from .mixins.apple import AppleCompilerMixin
+from .mixins.apple import AppleCompilerMixin, AppleCStdsMixin


mesonbuild/compilers/c.py

 from .mixins.clike import CLikeCompiler
 from .mixins.ccrx import CcrxCompiler
 from .mixins.xc16 import Xc16Compiler
 from .mixins.compcert import CompCertCompiler
 from .mixins.ti import TICompiler
 from .mixins.arm import ArmCompiler, ArmclangCompiler
 from .mixins.visualstudio import MSVCCompiler, ClangClCompiler
-from .mixins.gnu import GnuCompiler
+from .mixins.gnu import GnuCompiler, GnuCStds


mesonbuild/compilers/c.py

 from .mixins.clike import CLikeCompiler
 from .mixins.ccrx import CcrxCompiler
 from .mixins.xc16 import Xc16Compiler
 from .mixins.compcert import CompCertCompiler
 from .mixins.ti import TICompiler
 from .mixins.arm import ArmCompiler, ArmclangCompiler
 from .mixins.visualstudio import MSVCCompiler, ClangClCompiler
-from .mixins.gnu import GnuCompiler
+from .mixins.gnu import GnuCompiler, GnuCStds


mesonbuild/compilers/c.py

 from .mixins.gnu import gnu_common_warning_args, gnu_c_warning_args
 from .mixins.intel import IntelGnuLikeCompiler, IntelVisualStudioLikeCompiler
-from .mixins.clang import ClangCompiler
+from .mixins.clang import ClangCompiler, ClangCStds


mesonbuild/compilers/mixins/clang.py

 from ...linkers.linkers import AppleDynamicLinker, ClangClDynamicLinker, LLVMDynamicLinker, GnuGoldDynamicLinker, \
    MoldDynamicLinker, MSVCDynamicLinker
 from ...options import OptionKey
 from ..compilers import CompileCheckMode
 from .gnu import GnuLikeCompiler

 if T.TYPE_CHECKING:
+    from ...coredata import MutableKeyedOptionDictType


mesonbuild/compilers/mixins/clang.py

    from ...environment import Environment
    from ...dependencies import Dependency  # noqa: F401
+    from ..compilers import Compiler


mesonbuild/compilers/mixins/gnu.py

@@ -16,11 +16,12 @@

 from ... import mesonlib
 from ... import mlog
-from ...options import OptionKey
+from ...options import OptionKey, UserStdOption


mesonbuild/compilers/mixins/gnu.py

@@ -16,11 +16,12 @@

 from ... import mesonlib
 from ... import mlog
-from ...options import OptionKey
+from ...options import OptionKey, UserStdOption


mesonbuild/compilers/mixins/gnu.py

 from mesonbuild.compilers.compilers import CompileCheckMode

 if T.TYPE_CHECKING:
    from ..._typing import ImmutableListProtocol
+    from ...coredata import MutableKeyedOptionDictType


mesonbuild/compilers/c.py

 from .mixins.clike import CLikeCompiler
 from .mixins.ccrx import CcrxCompiler
 from .mixins.xc16 import Xc16Compiler
 from .mixins.compcert import CompCertCompiler
 from .mixins.ti import TICompiler
 from .mixins.arm import ArmCompiler, ArmclangCompiler
 from .mixins.visualstudio import MSVCCompiler, ClangClCompiler
-from .mixins.gnu import GnuCompiler
+from .mixins.gnu import GnuCompiler, GnuCStds


mesonbuild/compilers/c.py

 from .mixins.clike import CLikeCompiler
 from .mixins.ccrx import CcrxCompiler
 from .mixins.xc16 import Xc16Compiler
 from .mixins.compcert import CompCertCompiler
 from .mixins.ti import TICompiler
 from .mixins.arm import ArmCompiler, ArmclangCompiler
 from .mixins.visualstudio import MSVCCompiler, ClangClCompiler
-from .mixins.gnu import GnuCompiler
+from .mixins.gnu import GnuCompiler, GnuCStds


mesonbuild/compilers/mixins/apple.py

When used as a class decorator VSCode can no longer see that BasePlatformTest is a TestCase. I hate having to adapt the code to the tools, but it's really annoying to not have completion and syntax highlighting.

We'll want to use this for ObjC as well, so we'll make it public and put it in a public place.

This means that the two compilers will update together, and that ObjC has the list behavior that C does.

…mpiler We'll want to use this for the ObjC++ compiler too.

So we can re-use it for the ObjC code

So we can re-use it in the ObjC++ standards

To avoid duplication between C and ObjC

Check clang-cl as well as cl, and clang as well as gcc.

This tests ObjC and ObjC++ both with and without C enabled. I did this because I ran into issues where ObjC only worked when C was enabled, and then a later bug where C was disabled, due to the fact that C and ObjC both use `c_std` and not `objc_std`.

Since this is optional, we should not accept that GCC is a valid ObjC or G++ is a valid ObjC++ Compiler unless we've tested that they can actually do a basic compile. This requires fixing a number of tests that have broken assumptions. In some cases I've split tests where issues with one language would hide the other. It would be great if we had a competent test framework that allowed subtests to skip, unfortunately we have python's unittest instead. Because of that we can't avoid extra tests by use of subtests.

dcbaker requested a review from xclaesse September 6, 2024 17:15

github-advanced-security bot found potential problems Sep 6, 2024

View reviewed changes

dcbaker force-pushed the submit/fix-objc-standards branch from cce0240 to f8d86c3 Compare September 6, 2024 17:47

dcbaker added language:objc language:objc++ labels Sep 6, 2024

dcbaker force-pushed the submit/fix-objc-standards branch from f8d86c3 to 5a1175a Compare September 12, 2024 16:47

dcbaker requested a review from jpakkane as a code owner September 12, 2024 16:47

eli-schwartz reviewed Sep 25, 2024

View reviewed changes

mesonbuild/compilers/cpp.py Outdated Show resolved Hide resolved

unittests/allplatformstests.py Show resolved Hide resolved

dcbaker force-pushed the submit/fix-objc-standards branch from 5a1175a to 76b2563 Compare September 25, 2024 16:46

dcbaker force-pushed the submit/fix-objc-standards branch from 76b2563 to d4bcdc8 Compare September 25, 2024 16:48

github-advanced-security bot found potential problems Sep 25, 2024

View reviewed changes

dcbaker force-pushed the submit/fix-objc-standards branch 2 times, most recently from b05ecce to acb45fe Compare September 25, 2024 19:32

dcbaker force-pushed the submit/fix-objc-standards branch 2 times, most recently from e4810f9 to bed8bee Compare September 26, 2024 15:51

dcbaker force-pushed the submit/fix-objc-standards branch from bed8bee to 7b81d1c Compare November 18, 2024 16:56

github-advanced-security bot found potential problems Nov 18, 2024

View reviewed changes

dcbaker force-pushed the submit/fix-objc-standards branch 4 times, most recently from ad9ca0d to 92b11f7 Compare November 19, 2024 19:03

github-advanced-security bot found potential problems Nov 19, 2024

View reviewed changes

dcbaker force-pushed the submit/fix-objc-standards branch from 92b11f7 to 9899199 Compare November 19, 2024 20:06

dcbaker force-pushed the submit/fix-objc-standards branch from 9899199 to 8a18d07 Compare January 7, 2025 21:09

bruchar1 reviewed Jan 7, 2025

View reviewed changes

mesonbuild/compilers/mixins/apple.py Outdated Show resolved Hide resolved

dcbaker force-pushed the submit/fix-objc-standards branch 2 times, most recently from d04431f to d2156bc Compare January 9, 2025 17:26

dcbaker modified the milestones: 1.7, 1.8 Jan 9, 2025

dcbaker force-pushed the submit/fix-objc-standards branch from d2156bc to 68828c4 Compare January 16, 2025 15:19

thesamesam mentioned this pull request Jan 23, 2025

adding c_std=c2y option for clang #14174

Merged

dcbaker added 15 commits January 27, 2025 09:36

tests: Add annotations for assertMesonRaises

e2d32eb

tests: mock the environment in setUpClass

1d2627d

When used as a class decorator VSCode can no longer see that BasePlatformTest is a TestCase. I hate having to adapt the code to the tools, but it's really annoying to not have completion and syntax highlighting.

compilers/clang: Move the Mixin for C standards out of the c module

82fbf07

We'll want to use this for ObjC as well, so we'll make it public and put it in a public place.

compilers/objc: Use shared C standards with clang C compiler

d309e8d

This means that the two compilers will update together, and that ObjC has the list behavior that C does.

compilers/clang: split the Std handling for C++ out of the ClangCPPCo…

a935eee

…mpiler We'll want to use this for the ObjC++ compiler too.

compilers/objcpp: Use shared C++ standards with ClangCPPStandard

b5ff593

compilers/gnu: Pull C Standard handling out of GnuCCompiler

c7036e4

So we can re-use it for the ObjC code

compilers/objc: Use Shared GNU C standard handling

30ca64a

compilers/gnu: Split Gnu C++ standard handling into a mixin class

4f314ba

So we can re-use it in the ObjC++ standards

compilers/objcpp: Use the GnuCPPStdMixin for ObjC++

d650f6e

compilers: move Apple C Std version handling to a mixin

fa7716c

To avoid duplication between C and ObjC

compilers: split Apple C++ version handling to a mixin

19b67fb

unit tests: make the test_c_cpp_stds test more robust

18331db

Check clang-cl as well as cl, and clang as well as gcc.

dcbaker force-pushed the submit/fix-objc-standards branch from 68828c4 to 1eaab02 Compare January 27, 2025 17:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support lists for ObjC and ObjC++ standards #13642

Support lists for ObjC and ObjC++ standards #13642

dcbaker commented Sep 6, 2024

dcbaker commented Sep 6, 2024

bruchar1 commented Sep 6, 2024

dcbaker commented Sep 12, 2024

dcbaker commented Sep 25, 2024

bgilbert commented Sep 25, 2024

dcbaker commented Sep 25, 2024



		class ClangCCompiler(_ClangCStds, ClangCompiler, CCompiler):
		class ClangCCompiler(ClangCStds, ClangCompiler, CCompiler):


		class GnuObjCCompiler(GnuCompiler, ObjCCompiler):
		class GnuObjCCompiler(GnuCStds, GnuCompiler, ObjCCompiler):


		class ClangObjCCompiler(ClangCompiler, ObjCCompiler):
		class ClangObjCCompiler(ClangCStds, ClangCompiler, ObjCCompiler):


		class GnuObjCPPCompiler(GnuCompiler, ObjCPPCompiler):

		class GnuObjCPPCompiler(GnuCPPStds, GnuCompiler, ObjCPPCompiler):


		class ClangObjCPPCompiler(ClangCompiler, ObjCPPCompiler):

		class ClangObjCPPCompiler(ClangCPPStds, ClangCompiler, ObjCPPCompiler):

Support lists for ObjC and ObjC++ standards #13642

Are you sure you want to change the base?

Support lists for ObjC and ObjC++ standards #13642

Conversation

dcbaker commented Sep 6, 2024

dcbaker commented Sep 6, 2024

bruchar1 commented Sep 6, 2024

dcbaker commented Sep 12, 2024

dcbaker commented Sep 25, 2024

bgilbert commented Sep 25, 2024

dcbaker commented Sep 25, 2024