mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-12 20:09:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build images] Fix more char16_t/char32_t conversion warnings with LLVM 21

Browse Source 
- EncodingTables.h: Use std::common_type for safe comparisons between
  different Unicode code unit types (char16_t vs char32_t)
- TextCodecCJK.cpp: Change gb18030AsymmetricEncode to take char32_t
  since it operates on code points from CodePointIterator

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Claude Bot
2026-01-16 22:22:05 +00:00
parent d153c08423
commit 4e20483c2d
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/bun.js/bindings/EncodingTables.h
View File

@@ -58,14 +58,18 @@ inline void checkEncodingTableInvariants() {}
struct CompareFirst {
template<typename TypeA, typename TypeB> bool operator()(const TypeA& a, const TypeB& b)
{
return a.first < b.first;
// Use std::common_type to safely compare different character types (e.g., char16_t vs char32_t)
using CommonType = std::common_type_t<decltype(a.first), decltype(b.first)>;
return static_cast<CommonType>(a.first) < static_cast<CommonType>(b.first);
}
};
struct EqualFirst {
template<typename TypeA, typename TypeB> bool operator()(const TypeA& a, const TypeB& b)
{
return a.first == b.first;
// Use std::common_type to safely compare different character types (e.g., char16_t vs char32_t)
using CommonType = std::common_type_t<decltype(a.first), decltype(b.first)>;
return static_cast<CommonType>(a.first) == static_cast<CommonType>(b.first);
}
};
@@ -114,20 +118,23 @@ template<typename CollectionType> bool sortedFirstsAreUnique(const CollectionTyp
template<typename CollectionType, typename KeyType> static auto findFirstInSortedPairs(const CollectionType& collection, const KeyType& key) -> std::optional<decltype(std::begin(collection)->second)>
{
using CollectionKeyType = decltype(std::begin(collection)->first);
if constexpr (std::is_integral_v<KeyType>) {
if (key != decltype(std::begin(collection)->first)(key))
if (static_cast<KeyType>(static_cast<CollectionKeyType>(key)) != key)
return std::nullopt;
}
auto iterator = std::lower_bound(std::begin(collection), std::end(collection), makeFirstAdapter(key), CompareFirst {});
if (iterator == std::end(collection) || key < iterator->first)
using CommonType = std::common_type_t<KeyType, CollectionKeyType>;
if (iterator == std::end(collection) || static_cast<CommonType>(key) < static_cast<CommonType>(iterator->first))
return std::nullopt;
return iterator->second;
}
template<typename CollectionType, typename KeyType> static auto findInSortedPairs(const CollectionType& collection, const KeyType& key) -> std::span<std::remove_reference_t<decltype(*std::begin(collection))>>
{
using CollectionKeyType = decltype(std::begin(collection)->first);
if constexpr (std::is_integral_v<KeyType>) {
if (key != decltype(std::begin(collection)->first)(key))
if (static_cast<KeyType>(static_cast<CollectionKeyType>(key)) != key)
return {};
}
return std::ranges::equal_range(collection, makeFirstAdapter(key), CompareFirst {});

2
src/bun.js/bindings/TextCodecCJK.cpp
View File

@@ -890,7 +890,7 @@ static const GB18030EncodeIndex& gb18030EncodeIndex()
// https://unicode-org.atlassian.net/browse/ICU-22357
// The 2-byte values are handled correctly by values from gb18030()
// but these need to be exceptions from gb18030Ranges().
static std::optional<uint16_t> gb18030AsymmetricEncode(char16_t codePoint)
static std::optional<uint16_t> gb18030AsymmetricEncode(char32_t codePoint)
{
switch (codePoint) {
case 0xE81E: