roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-06-06 00:19:08 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Be more careful about optimizing sorted arrays."

Browse Source 
This reverts commit a8a31880a42f5283f30c6f670ce7da8940fe43a3.
This resolves #966
This commit is contained in:
Pale Moon
2017-03-19 09:29:39 +01:00
committed by roytam1
parent 2c9b1e3a23
commit 034fc6a4c9
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/src/jsarray.cpp
+1 -8
View File
@@ -1933,7 +1933,6 @@ js::array_sort(JSContext* cx, unsigned argc, Value* vp)
undefs = 0;
bool allStrings = true;
bool allInts = true;
bool extraIndexed = ObjectMayHaveExtraIndexedProperties(obj);
RootedValue v(cx);
for (uint32_t i = 0; i < len; i++) {
if (!CheckForInterrupt(cx))
@@ -1966,9 +1965,7 @@ js::array_sort(JSContext* cx, unsigned argc, Value* vp)
}
/* Here len == n + undefs + number_of_holes. */
bool defaultOrMatch;
if (fval.isNull()) {
defaultOrMatch = true;
/*
* Sort using the default comparator converting all elements to
* strings.
@@ -1992,7 +1989,6 @@ js::array_sort(JSContext* cx, unsigned argc, Value* vp)
if (comp == Match_Failure)
return false;
defaultOrMatch = comp != Match_None;
if (comp != Match_None) {
if (allInts) {
JS_ALWAYS_TRUE(vec.resize(n * 2));
@@ -2013,10 +2009,7 @@ js::array_sort(JSContext* cx, unsigned argc, Value* vp)
}
}
ShouldUpdateTypes updateTypes = !extraIndexed && (allStrings || allInts) && defaultOrMatch
? ShouldUpdateTypes::DontUpdateTypes
: ShouldUpdateTypes::UpdateTypes;
if (!InitArrayElements(cx, obj, 0, uint32_t(n), vec.begin(), updateTypes))
if (!InitArrayElements(cx, obj, 0, uint32_t(n), vec.begin(), DontUpdateTypes))
return false;
}