Skip to content

refactor: c++ 17 #7038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
+14 −13
Draft

refactor: c++ 17 #7038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b00bba6
Set cpp standard to 17
ShortDevelopment Oct 4, 2025
e77bbfe
Remove deprecated exception spec
ShortDevelopment Oct 4, 2025
87323ae
Fix styling
ShortDevelopment Oct 4, 2025
a1842fe
Upgrade to catch v1.12.2
ShortDevelopment Oct 4, 2025
177a3e0
`std::uncaught_exception` deprecated
ShortDevelopment Oct 4, 2025
cd81a22
Use `icu4c` on MacOS again
ShortDevelopment Oct 9, 2025
6bf3471
Add missing `noexcept(false)`
ShortDevelopment Oct 10, 2025
b8e02b3
Move msbuild `LanguageStandard` to existing structure
ShortDevelopment Oct 10, 2025
71680df
Ensure ci failure is because of c++17
ShortDevelopment Oct 20, 2025
534bbfa
Revert "`std::uncaught_exception` deprecated"
ShortDevelopment Oct 21, 2025
ea50226
Revert "Upgrade to catch v1.12.2"
ShortDevelopment Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ task:
macos_instance:
image: ghcr.io/cirruslabs/macos-ventura-xcode
Dependencies_script: brew install ninja icu4c && mkdir -p build
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DSTATIC_LIBRARY=ON -DEMBED_ICU=ON -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DSTATIC_LIBRARY=ON -DICU_INCLUDE_PATH=/opt/homebrew/opt/icu4c/include -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
Build_script: cd build && ninja
Test_script: cd build && ninja check

Expand All @@ -17,7 +17,7 @@ task:
macos_instance:
image: ghcr.io/cirruslabs/macos-ventura-xcode
Dependencies_script: brew install ninja icu4c && mkdir -p build
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBED_ICU=ON -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DICU_INCLUDE_PATH=/opt/homebrew/opt/icu4c/include -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
Build_script: cd build && ninja
Test_script: cd build && ninja check

Expand All @@ -26,6 +26,6 @@ task:
macos_instance:
image: ghcr.io/cirruslabs/macos-ventura-xcode
Dependencies_script: brew install ninja icu4c && mkdir -p build
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DSTATIC_LIBRARY=ON -DEMBED_ICU=ON -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DSTATIC_LIBRARY=ON -DICU_INCLUDE_PATH=/opt/homebrew/opt/icu4c/include -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
Build_script: cd build && ninja
Test_script: cd build && ninja check
2 changes: 1 addition & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ cpp_new_line_before_catch = true
cpp_new_line_before_else = true

# Xml files
[*.xml]
[*.{xml,props}]
indent_size = 2
2 changes: 1 addition & 1 deletion Build/Common.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<PreprocessorDefinitions Condition="'$(ChakraVersionBuildCommit)'!=''">%(PreprocessorDefinitions);CHAKRA_VERSION_BUILD_COMMIT=$(ChakraVersionBuildCommit)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(ChakraVersionBuildDate)'!=''">%(PreprocessorDefinitions);CHAKRA_VERSION_BUILD_DATE=$(ChakraVersionBuildDate)</PreprocessorDefinitions>


<!--<LanguageStandard>stdcpp17</LanguageStandard>-->
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions Condition="'$(ChakraVersionBuildNumber)'!=''">%(PreprocessorDefinitions);CHAKRA_VERSION_BUILD_NUMBER=$(ChakraVersionBuildNumber)</PreprocessorDefinitions>
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ if(CLR_CMAKE_PLATFORM_XPLAT)
-D__STDC_WANT_LIB_EXT1__=1
)

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED On)

# todo: fix general visibility of the interface
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ jobs:
image_name: 'macOS-latest'
deps: 'brew install ninja icu4c'
build_type: 'RelWithDebInfo'
libtype_flag: '-DEMBED_ICU=ON'
libtype_flag: '-DICU_INCLUDE_PATH=/usr/local/opt/icu4c/include'
OSX.Release:
image_name: 'macOS-latest'
deps: 'brew install ninja icu4c'
build_type: 'Release'
libtype_flag: '-DEMBED_ICU=ON'
libtype_flag: '-DICU_INCLUDE_PATH=/usr/local/opt/icu4c/include'

pool:
vmImage: $(image_name)
Expand Down
11 changes: 6 additions & 5 deletions lib/Runtime/Language/JavascriptExceptionOperators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#pragma once
Expand All @@ -9,13 +10,13 @@ extern "C" void *amd64_CallWithFakeFrame(void *target,
void *frame,
size_t spillSize,
size_t argsSize,
void *arg0 = nullptr) throw(...);
void *arg0 = nullptr) noexcept(false);
#elif defined(_M_ARM)
extern "C" void *arm_CallEhFrame(void *target, void *framePtr, void *localsPtr, size_t argsSize) throw(...);
extern "C" void *arm_CallCatch(void *target, void *framePtr, void *localsPtr, size_t argsSize, void *catchObj) throw(...);
extern "C" void *arm_CallEhFrame(void *target, void *framePtr, void *localsPtr, size_t argsSize) noexcept(false);
extern "C" void *arm_CallCatch(void *target, void *framePtr, void *localsPtr, size_t argsSize, void *catchObj) noexcept(false);
#elif defined(_M_ARM64)
extern "C" void *arm64_CallEhFrame(void *target, void *framePtr, void *localsPtr, size_t argsSize) throw(...);
extern "C" void *arm64_CallCatch(void *target, void *framePtr, void *localsPtr, size_t argsSize, void *catchObj) throw(...);
extern "C" void *arm64_CallEhFrame(void *target, void *framePtr, void *localsPtr, size_t argsSize) noexcept(false);
extern "C" void *arm64_CallCatch(void *target, void *framePtr, void *localsPtr, size_t argsSize, void *catchObj) noexcept(false);
#endif

namespace Js
Expand Down