Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 15:55:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1650765) for causing failures in EncodeAsString.

Browse Source 
CLOSED TREE

Backed out changeset 784be0839695 (bug 1650765)
Backed out changeset 05f1ba04a8f4 (bug 1650765)
This commit is contained in:
Mihai Alexandru Michis 2020-07-07 15:15:57 +03:00
parent 9a1ef55f96
commit b0a62934ab
1 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dom/indexedDB/Key.cpp
View File

@ -21,7 +21,6 @@
#include "mozilla/CheckedInt.h"
#include "mozilla/EndianUtils.h"
#include "mozilla/FloatingPoint.h"
#include "mozilla/ReverseIterator.h"
#include "mozIStorageStatement.h"
#include "mozIStorageValueArray.h"
#include "nsAlgorithm.h"
@ -569,17 +568,8 @@ IDBResult<void, IDBSpecialValue::Invalid> Key::EncodeAsString(
MOZ_ASSERT(size.isValid());
// We construct a range over the raw pointers here because this loop is
// time-critical.
// XXX It might be good to encapsulate this in some function to make it less
// error-prone and more expressive.
const auto inputRange = mozilla::detail::IteratorRange(
aInput.Elements(), aInput.Elements() + aInput.Length());
bool anyMultibyte = false;
for (const auto val : inputRange) {
for (const auto val : aInput) {
if (val > ONE_BYTE_LIMIT) {
anyMultibyte = true;
size += char16_t(val) > TWO_BYTE_LIMIT ? 2 : 1;
if (!size.isValid()) {
IDB_REPORT_INTERNAL_ERR();
@ -608,33 +598,19 @@ IDBResult<void, IDBSpecialValue::Invalid> Key::EncodeAsString(
*(buffer++) = aType;
// Encode string
if (anyMultibyte) {
for (const auto val : inputRange) {
if (val <= ONE_BYTE_LIMIT) {
*(buffer++) = val + ONE_BYTE_ADJUST;
} else if (char16_t(val) <= TWO_BYTE_LIMIT) {
char16_t c = char16_t(val) + TWO_BYTE_ADJUST + 0x8000;
*(buffer++) = (char)(c >> 8);
*(buffer++) = (char)(c & 0xFF);
} else {
uint32_t c = (uint32_t(val) << THREE_BYTE_SHIFT) | 0x00C00000;
*(buffer++) = (char)(c >> 16);
*(buffer++) = (char)(c >> 8);
*(buffer++) = (char)c;
}
for (const auto val : aInput) {
if (val <= ONE_BYTE_LIMIT) {
*(buffer++) = val + ONE_BYTE_ADJUST;
} else if (char16_t(val) <= TWO_BYTE_LIMIT) {
char16_t c = char16_t(val) + TWO_BYTE_ADJUST + 0x8000;
*(buffer++) = (char)(c >> 8);
*(buffer++) = (char)(c & 0xFF);
} else {
uint32_t c = (uint32_t(val) << THREE_BYTE_SHIFT) | 0x00C00000;
*(buffer++) = (char)(c >> 16);
*(buffer++) = (char)(c >> 8);
*(buffer++) = (char)c;
}
} else {
// Optimization for the case where there are no multibyte characters.
// This is ca. 13 resp. 5.8 times faster than the non-optimized version in
// an -O2 build: https://quick-bench.com/q/v1oBpLGifs-3w_pkZG8alVSWVAw, for
// the T==uint8_t resp. T==char16_t cases (for the char16_t case, copying
// and then adjusting could even be slightly faster, but then we would need
// another case distinction here)
const auto inputLen = std::distance(inputRange.cbegin(), inputRange.cend());
MOZ_ASSERT(inputLen == size);
std::transform(inputRange.cbegin(), inputRange.cend(), buffer,
[](auto value) { return value + ONE_BYTE_ADJUST; });
buffer += inputLen;
}
// Write end marker