Merge V8 5.2.361.47 DO NOT MERGE
https://chromium.googlesource.com/v8/v8/+/5.2.361.47
FPIIM-449
Change-Id: Ibec421b85a9b88cb3a432ada642e469fe7e78346
(cherry picked from commit bcf72ee8e3b26f1d0726869c7ddb3921c68b09a8)
diff --git a/src/js/regexp.js b/src/js/regexp.js
index cc8cb41..719a081 100644
--- a/src/js/regexp.js
+++ b/src/js/regexp.js
@@ -4,14 +4,11 @@
(function(global, utils) {
-'use strict';
-
%CheckIsBootstrapping();
// -------------------------------------------------------------------
// Imports
-var AddIndexedProperty;
var ExpandReplacement;
var GlobalArray = global.Array;
var GlobalObject = global.Object;
@@ -29,7 +26,6 @@
var SpeciesConstructor;
utils.Import(function(from) {
- AddIndexedProperty = from.AddIndexedProperty;
ExpandReplacement = from.ExpandReplacement;
MakeTypeError = from.MakeTypeError;
MaxSimple = from.MaxSimple;
@@ -502,7 +498,7 @@
var result;
if (size === 0) {
result = RegExpSubclassExec(splitter, string);
- if (IS_NULL(result)) AddIndexedProperty(array, 0, string);
+ if (IS_NULL(result)) %AddElement(array, 0, string);
return array;
}
var stringIndex = prevStringIndex;
@@ -515,10 +511,10 @@
stringIndex += AdvanceStringIndex(string, stringIndex, unicode);
} else {
var end = MinSimple(TO_LENGTH(splitter.lastIndex), size);
- if (end === stringIndex) {
+ if (end === prevStringIndex) {
stringIndex += AdvanceStringIndex(string, stringIndex, unicode);
} else {
- AddIndexedProperty(
+ %AddElement(
array, arrayIndex,
%_SubString(string, prevStringIndex, stringIndex));
arrayIndex++;
@@ -526,7 +522,7 @@
prevStringIndex = end;
var numberOfCaptures = MaxSimple(TO_LENGTH(result.length), 0);
for (var i = 1; i < numberOfCaptures; i++) {
- AddIndexedProperty(array, arrayIndex, result[i]);
+ %AddElement(array, arrayIndex, result[i]);
arrayIndex++;
if (arrayIndex === lim) return array;
}
@@ -534,7 +530,7 @@
}
}
}
- AddIndexedProperty(array, arrayIndex,
+ %AddElement(array, arrayIndex,
%_SubString(string, prevStringIndex, size));
return array;
}