Reviewers: dcarney,
Description:
Correctly convert micro-sign to its upper case.
[email protected]
BUG=355485
LOG=N
Please review this at https://codereview.chromium.org/209323007/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+18, -12 lines):
M src/runtime.cc
A + test/mjsunit/regress/regress-355485.js
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
8b18e55278cb072cd89d8c43faaa34291369775f..ed1d27fb23966d67c50c4e943d9b9bcc226eb2c2
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -6312,6 +6312,15 @@ RUNTIME_FUNCTION(MaybeObject*,
Runtime_StringParseFloat) {
}
+static inline bool ToUpperOverflows(uc32 character) {
+ // y with umlauts and the micro sign are the only characters that stop
+ // fitting into one-byte when converting to uppercase.
+ static const uc32 yuml_code = 0xff;
+ static const uc32 micro_code = 0xb5;
+ return (character == yuml_code || character == micro_code);
+}
+
+
template <class Converter>
MUST_USE_RESULT static MaybeObject* ConvertCaseHelper(
Isolate* isolate,
@@ -6339,10 +6348,7 @@ MUST_USE_RESULT static MaybeObject*
ConvertCaseHelper(
unibrow::uchar chars[Converter::kMaxWidth];
// We can assume that the string is not empty
uc32 current = stream.GetNext();
- // y with umlauts is the only character that stops fitting into one-byte
- // when converting to uppercase.
- static const uc32 yuml_code = 0xff;
- bool ignore_yuml = result->IsSeqTwoByteString() || Converter::kIsToLower;
+ bool ignore_overflow = Converter::kIsToLower ||
result->IsSeqTwoByteString();
for (int i = 0; i < result_length;) {
bool has_next = stream.HasMore();
uc32 next = has_next ? stream.GetNext() : 0;
@@ -6351,14 +6357,15 @@ MUST_USE_RESULT static MaybeObject*
ConvertCaseHelper(
// The case conversion of this character is the character itself.
result->Set(i, current);
i++;
- } else if (char_length == 1 && (ignore_yuml || current != yuml_code)) {
+ } else if (char_length == 1 &&
+ (ignore_overflow || !ToUpperOverflows(current))) {
// Common case: converting the letter resulted in one character.
ASSERT(static_cast<uc32>(chars[0]) != current);
result->Set(i, chars[0]);
has_changed_character = true;
i++;
} else if (result_length == string->length()) {
- bool found_yuml = (current == yuml_code);
+ bool overflows = ToUpperOverflows(current);
// We've assumed that the result would be as long as the
// input but here is a character that converts to several
// characters. No matter, we calculate the exact length
@@ -6378,7 +6385,7 @@ MUST_USE_RESULT static MaybeObject* ConvertCaseHelper(
int current_length = i + char_length + next_length;
while (stream.HasMore()) {
current = stream.GetNext();
- found_yuml |= (current == yuml_code);
+ overflows |= ToUpperOverflows(current);
// NOTE: we use 0 as the next character here because, while
// the next character may affect what a character converts to,
// it does not in any case affect the length of what it convert
@@ -6392,9 +6399,9 @@ MUST_USE_RESULT static MaybeObject* ConvertCaseHelper(
}
}
// Try again with the real length. Return signed if we need
- // to allocate a two-byte string for y-umlaut to uppercase.
- return (found_yuml && !ignore_yuml) ? Smi::FromInt(-current_length)
- : Smi::FromInt(current_length);
+ // to allocate a two-byte string for to uppercase.
+ return (overflows && !ignore_overflow) ?
Smi::FromInt(-current_length)
+ :
Smi::FromInt(current_length);
} else {
for (int j = 0; j < char_length; j++) {
result->Set(i, chars[j]);
Index: test/mjsunit/regress/regress-355485.js
diff --git a/test/mjsunit/regress/regress-crbug-351262.js
b/test/mjsunit/regress/regress-355485.js
similarity index 77%
copy from test/mjsunit/regress/regress-crbug-351262.js
copy to test/mjsunit/regress/regress-355485.js
index
a2f4eadc0de5c2bd7d27f6e78ff9940fce7b0f85..3c66884c000dd5860b2bd9c82705f7a58afb28ae
100644
--- a/test/mjsunit/regress/regress-crbug-351262.js
+++ b/test/mjsunit/regress/regress-355485.js
@@ -2,5 +2,4 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-for (var x in this) {};
-JSON.stringify(this);
+assertEquals("\u039c", "\u00b5".toUpperCase());
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
