languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-07-19 20:17:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[dart2wasm] Fix string fromCharCodes for some unicode surrogate pairs.

Browse source 
Change-Id: Id6ceb12057a1e5a419eb7fc30b6995aed8159321
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/265620
Commit-Queue: Ömer Ağacan <omersa@google.com>
Reviewed-by: Ömer Ağacan <omersa@google.com>
This commit is contained in:
Joshua Litt 2022-10-26 07:36:50 +00:00 committed by Commit Queue
parent 79405df629
commit 97bcffb7c7
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sdk/lib/_internal/wasm/lib/class_id.dart
View file

@ -22,6 +22,14 @@ class ClassID {
external static int get cidFunction;
@pragma("wasm:class-id", "dart.core#_Function")
external static int get cid_Function;
@pragma("wasm:class-id", "dart.core#_List")
external static int get cidFixedLengthList;
@pragma("wasm:class-id", "dart.core#_ListBase")
external static int get cidListBase;
@pragma("wasm:class-id", "dart.core#_GrowableList")
external static int get cidGrowableList;
@pragma("wasm:class-id", "dart.core#_ImmutableList")
external static int get cidImmutableList;
// Class IDs for RTI Types.
@pragma("wasm:class-id", "dart.core#_NeverType")

25
sdk/lib/_internal/wasm/lib/string_patch.dart
View file

@ -125,12 +125,18 @@ abstract class _StringBase implements String {
static String createFromCharCodes(
Iterable<int> charCodes, int start, int? end, int? limit) {
// TODO(srdjan): Also skip copying of wide typed arrays.
if (charCodes is Uint8List) {
final actualEnd =
RangeError.checkValidRange(start, end, charCodes.length);
return _createOneByteString(charCodes, start, actualEnd - start);
} else if (charCodes is! Uint16List) {
return _createStringFromIterable(charCodes, start, end);
final ccid = ClassID.getID(charCodes);
if (ccid != ClassID.cidFixedLengthList &&
ccid != ClassID.cidListBase &&
ccid != ClassID.cidGrowableList &&
ccid != ClassID.cidImmutableList) {
if (charCodes is Uint8List) {
final actualEnd =
RangeError.checkValidRange(start, end, charCodes.length);
return _createOneByteString(charCodes, start, actualEnd - start);
} else if (charCodes is! Uint16List) {
return _createStringFromIterable(charCodes, start, end);
}
}
final int codeCount = charCodes.length;
final actualEnd = RangeError.checkValidRange(start, end, codeCount);
@ -172,11 +178,8 @@ abstract class _StringBase implements String {
if (charCodes is EfficientLengthIterable) {
int length = charCodes.length;
final endVal = RangeError.checkValidRange(start, end, length);
final Uint16List charCodeList = Uint16List(endVal - start);
int i = 0;
for (final char in charCodes.take(endVal).skip(start)) {
charCodeList[i++] = char;
}
final charCodeList =
List<int>.from(charCodes.take(endVal).skip(start), growable: false);
return createFromCharCodes(charCodeList, 0, charCodeList.length, null);
}
// Don't know length of iterable, so iterate and see if all the values