Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2025-05-14 14:36:05 +08:00
commit e72f8a3a81
140 changed files with 1117 additions and 466 deletions

View file

@ -746,8 +746,9 @@ static inline auto FindUnicodeExtensionType(JSLinearString* unicodeExtension,
UnicodeKey key) {
JS::AutoCheckCannotGC nogc;
return unicodeExtension->hasLatin1Chars()
? FindUnicodeExtensionType(unicodeExtension->latin1Chars(nogc),
unicodeExtension->length(), key)
? FindUnicodeExtensionType(
reinterpret_cast<const char*>(unicodeExtension->latin1Chars(nogc)),
unicodeExtension->length(), key)
: FindUnicodeExtensionType(unicodeExtension->twoByteChars(nogc),
unicodeExtension->length(), key);
}
@ -858,7 +859,9 @@ static BaseNamePartsResult BaseNameParts(const CharT* baseName, size_t length) {
static inline auto BaseNameParts(JSLinearString* baseName) {
JS::AutoCheckCannotGC nogc;
return baseName->hasLatin1Chars()
? BaseNameParts(baseName->latin1Chars(nogc), baseName->length())
? BaseNameParts(
reinterpret_cast<const char*>(baseName->latin1Chars(nogc)),
baseName->length())
: BaseNameParts(baseName->twoByteChars(nogc), baseName->length());
}