Skip to content

leverage simdutf more #5797

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

Merged
anonrig merged 1 commit into from
Dec 30, 2025
Merged

leverage simdutf more #5797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions src/workerd/api/encoding.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,22 +555,21 @@ jsg::JsUint8Array TextEncoder::encode(jsg::Lock& js, jsg::Optional<jsg::JsString
writeResult.written == length, "writeInto must completely overwrite the backing buffer");

auto data = reinterpret_cast<char16_t*>(utf16Buffer.begin());
utf8_length = simdutf::utf8_length_from_utf16_with_replacement(data, length).count;
auto lengthResult = simdutf::utf8_length_from_utf16_with_replacement(data, length);
utf8_length = lengthResult.count;

auto backingStore = js.allocBackingStore(utf8_length, jsg::Lock::AllocOption::UNINITIALIZED);
auto result = simdutf::convert_utf16_to_utf8_with_errors(
data, length, reinterpret_cast<char*>(backingStore->Data()));

if (result.error != simdutf::SUCCESS) {
// Oh, no, there are unpaired surrogates. This is hopefully rare.
if (lengthResult.error == simdutf::SURROGATE) {
// If there are surrogates there may be unpaired surrogates. Fix them.
simdutf::to_well_formed_utf16(data, length, data);
[[maybe_unused]] auto written =
simdutf::convert_utf16_to_utf8(data, length, reinterpret_cast<char*>(backingStore->Data()));
KJ_DASSERT(written == utf8_length, "Conversion yielded wrong number of UTF-8 bytes");
} else {
KJ_DASSERT(result.count == utf8_length, "Conversion yielded wrong number of UTF-8 bytes");
KJ_DASSERT(lengthResult.error == simdutf::SUCCESS);
}

auto backingStore = js.allocBackingStore(utf8_length, jsg::Lock::AllocOption::UNINITIALIZED);
[[maybe_unused]] auto written =
simdutf::convert_utf16_to_utf8(data, length, reinterpret_cast<char*>(backingStore->Data()));
KJ_DASSERT(written == utf8_length, "Conversion yielded wrong number of UTF-8 bytes");

auto array =
v8::Uint8Array::New(v8::ArrayBuffer::New(js.v8Isolate, kj::mv(backingStore)), 0, utf8_length);
return jsg::JsUint8Array(array);
Expand Down
Loading