SR-11917: Using JSONEncoder's .outputFormatting = .sortedKeys has a memory leak on Linux #2655
Conversation
|
@swift-ci test |
| #if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX | ||
| #if TARGET_OS_MAC |
There was a problem hiding this comment.
This exposes the variable collator at l616, which is still hidden behind an #if tag above (l577), so this doesn't build properly on other platforms.
There was a problem hiding this comment.
Thanks for catching this. Do you think the the #if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX could be removed entirely and the code would work on the BSD platforms? btw which platforms are you testing on?
There was a problem hiding this comment.
Thanks, that builds cleanly now.
The platform-specific branches could be removed -- I did a rush check adding TARGET_OS_BSD on every appearance of TARGET_OS_LINUX atop this commit -- but they'd need to be removed in more places than you are changing here, so perhaps that should be done in a separate PR.
However, I haven't run any of the tests; right now I am just checking to ensure things build properly on OpenBSD without error.
There was a problem hiding this comment.
Thanks for checking, yes probably best to support other platforms in a future PR.
…emory leak on Linux - Any use of NSString.compare(_:options:range:locale:) with a non-nil locale would leak on Linux. - _CFCompareStringsWithLocale was leaking the collator on non-macOS platforms. - Use the collator cache on Linux and Win32 the same way that macOS does.
|
@swift-ci test |
|
@swift-ci test linux |
1 similar comment
|
@swift-ci test linux |
|
@compnerd could you test this on windows when you get a chance? thanks |
|
@swift-ci test linux |
1 similar comment
|
@swift-ci test linux |
|
@swift-ci test and merge |
Any use of NSString.compare(_:options:range:locale:) with a non-nil locale
would leak on Linux.
_CFCompareStringsWithLocale was leaking the collator on non-macOS
platforms.
Use the collator cache on Linux and Win32 the same way that macOS does
and for other platforms ensure that any allocated collator is freed.