Everywhere: Move to C++26 (and remove an OSS-Fuzz workaround) #26524
+293
−89
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
👀 pr-needs-review
spholz
commented
Dec 29, 2025
spholz
force-pushed
the
c++26
branch
2 times, most recently
from
d15644c to
d00e1bf
Compare
nico
reviewed
Dec 30, 2025
| set(CMAKE_CXX_STANDARD 23) | ||
|
|
||
| # FIXME: Remove this once CMake knows that AppleClang understands -std=c++26. | ||
| if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") |
Contributor
There was a problem hiding this comment.
Per Discord, this might work:
# FIXME: Remove this once CMake knows that AppleClang understands -std=c++26,
# see https://gitlab.kitware.com/cmake/cmake/-/issues/27486
if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX23_STANDARD_COMPILE_OPTION "")
set(CMAKE_CXX_FLAGS "-std=c++26")
else()
set(CMAKE_CXX_STANDARD 26)
endif()
2805a57 to
40deb02
Compare
main.mm used to not do this as it didn't include AK headers. We're about to put another workaround in CocoaWrapper.h that's needed here too though. No behavior change.
No behavior change.
No behavior change.
QD/ColorSyncDeprecated.h, normally pulled in by Cocoa.h, contains
many enums triggering
"invalid arithmetic between different enumeration types"
in C++26. Omit it from the build by hackily defining its include
guard macro.
Carbon.h also pulls in QD/ColorSyncDeprecated.h, and other than in the previous commit we can't just hack it out, since that breaks other things in Carbon.h. But we only need Carbon.h for two enums in HIToolbox/Events.h, so locally define those enums directly. No behavior change.
nico
approved these changes
Jan 2, 2026
ADKaster
reviewed
Jan 2, 2026
| if: ${{ inputs.os == 'macOS' }} | ||
| shell: bash | ||
| run: | | ||
| sudo xcode-select -s /Applications/Xcode_26.1.app/Contents/Developer |
Member
There was a problem hiding this comment.
previously (and in ladybird) we've used this action to do this: https://github.com/maxim-lobanov/setup-xcode.
No real impact to use the manual way vs an action, other than a slightly 'prettier' yaml. though now that ladybird uses custom runners and blacksmith, idk if that action is still used :thonk:
Member
Author
There was a problem hiding this comment.
I think I'd rather use a simple one-liner here than depending on some external action.
This will be necessary for moving to C++26.
This will be necessary for moving to C++26.
This will be necessary for moving to C++26.
Building OSS-Fuzz locally showed that this workaround doesn't seem to be necessary anymore.
github-actions
bot
removed
the
👀 pr-needs-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now that OSS-Fuzz is on LLVM 22 and the newest Apple Clang version accepts
-std=c++26, we can set ourCMAKE_CXX_STANDARDto C++26 and start using some of the fancy new features.