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

Bug 977900: Add collide method back in Array.scatterPar; r=shu

Browse Source
This commit is contained in:
Benjamin Bouvier 2014-03-04 09:58:06 +01:00
parent 49c57363fd
commit ab1b53739b
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/builtin/Array.js
View File

@ -890,6 +890,13 @@ function ArrayScatterPar(targets, defaultValue, conflictFunc, length, mode) {
return buffer;
}
function collide(elem1, elem2) {
if (conflictFunc === undefined)
ThrowError(JSMSG_PAR_ARRAY_SCATTER_CONFLICT);
return conflictFunc(elem1, elem2);
}
function checkTarget(i, t) {
if (TO_INT32(t) !== t)
ThrowError(JSMSG_PAR_ARRAY_SCATTER_BAD_TARGET, i);

5
js/src/jit-test/tests/parallel/bug977900.js Normal file
View File

@ -0,0 +1,5 @@
if (!getBuildConfiguration().parallelJS)
quit();
function chooseMax(a, b) { return a>b?a:b;};
var a = [1,2].scatterPar([0,0], -1, chooseMax);