summaryrefslogtreecommitdiff
path: root/chromium/v8/src/builtins/builtins-string.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/v8/src/builtins/builtins-string.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/v8/src/builtins/builtins-string.cc')
-rw-r--r--chromium/v8/src/builtins/builtins-string.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/chromium/v8/src/builtins/builtins-string.cc b/chromium/v8/src/builtins/builtins-string.cc
index 8a897765c83..df5ba93a59e 100644
--- a/chromium/v8/src/builtins/builtins-string.cc
+++ b/chromium/v8/src/builtins/builtins-string.cc
@@ -40,14 +40,16 @@ bool IsValidCodePoint(Isolate* isolate, Handle<Object> value) {
return true;
}
+static constexpr uc32 kInvalidCodePoint = static_cast<uc32>(-1);
+
uc32 NextCodePoint(Isolate* isolate, BuiltinArguments args, int index) {
Handle<Object> value = args.at(1 + index);
- ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, value,
- Object::ToNumber(isolate, value), -1);
+ ASSIGN_RETURN_ON_EXCEPTION_VALUE(
+ isolate, value, Object::ToNumber(isolate, value), kInvalidCodePoint);
if (!IsValidCodePoint(isolate, value)) {
isolate->Throw(*isolate->factory()->NewRangeError(
MessageTemplate::kInvalidCodePoint, value));
- return -1;
+ return kInvalidCodePoint;
}
return DoubleToUint32(value->Number());
}
@@ -69,7 +71,7 @@ BUILTIN(StringFromCodePoint) {
int index;
for (index = 0; index < length; index++) {
code = NextCodePoint(isolate, args, index);
- if (code < 0) {
+ if (code == kInvalidCodePoint) {
return ReadOnlyRoots(isolate).exception();
}
if (code > String::kMaxOneByteCharCode) {
@@ -99,7 +101,7 @@ BUILTIN(StringFromCodePoint) {
break;
}
code = NextCodePoint(isolate, args, index);
- if (code < 0) {
+ if (code == kInvalidCodePoint) {
return ReadOnlyRoots(isolate).exception();
}
}