-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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.
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
[iOS][non-icu] HybridGlobalization clean up the code #96974
Conversation
Tagging subscribers to this area: @dotnet/area-system-globalization Issue DetailsFixes #96328
|
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst |
Azure Pipelines successfully started running 3 pipeline(s). |
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst |
Azure Pipelines successfully started running 3 pipeline(s). |
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst |
Azure Pipelines successfully started running 3 pipeline(s). |
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst |
Azure Pipelines successfully started running 3 pipeline(s). |
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst |
Azure Pipelines successfully started running 3 pipeline(s). |
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst |
Azure Pipelines successfully started running 3 pipeline(s). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM apart from the pal_config.h issue
src/mono/mono/mini/CMakeLists.txt
Outdated
@@ -658,3 +658,6 @@ if(NOT DISABLE_EXECUTABLES) | |||
|
|||
install_with_stripped_symbols(mono-sgen TARGETS bin) | |||
endif() | |||
configure_file( | |||
${CLR_SRC_NATIVE_DIR}/libs/Common/pal_config.h.in | |||
${CMAKE_CURRENT_BINARY_DIR}/pal_config.h) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we shouldn't mix our configs with pal_config.h.in, if you need any of the HAVE_*
defines then you need to include them in src/mono/cmake/configure.cmake
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want to use assert_msg
from https://github.com/mkhamoyan/runtime/blob/main/src/native/libs/Common/pal_utilities.h#L27 in pal_placeholders.c
(instead of defining them again here https://github.com/mkhamoyan/runtime/blob/main/src/native/libs/System.Globalization.Native/pal_placeholders.c#L18-L38) . But when including "pal_utilities.h"
header in pal_placeholders.c
, it complains that can't find pal_config.h
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can either move it to a new header file in src/native/minipal since that one is supposed to be shared between runtimes.
Or given our future direction of wanting to stop compiling globalization in mono runtime itself maybe it's better to just copy the assert_msg
definition into mono since it will get removed later anyway.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, kept initial way of copying assert_msg
definition into mono.
/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst |
Azure Pipelines successfully started running 3 pipeline(s). |
Failures are not related. |
Clean up the code
Fixes #96328
Contributes to #80689