Commit 360586f2 authored by adamk's avatar adamk Committed by Commit bot

Add fast paths for native RegExps in ES2015 subclass-aware code

This patch adds fast paths for @@replace and @@split that call into
the old, side-effect free (and faster) versions of those builtin
operations when possible (roughly, when the receiver is a RegExp
and the 'exec' method is untampered). Also add some micro-optimizations
that further improve performance.

Taken altogether, this takes us from a ~70% regression on the Octane
RegExp benchmark to a ~9% regression.

The test262.status lines for RegExps has been reorganized to make it
clearer the status of individual tests. More work will likely be
required to increase spec compliance before the --harmony-regexp-exec
flag is shipped; some of that work is happening on the spec side.

BUG=v8:4602
LOG=y

Review URL: https://codereview.chromium.org/1836123002

Cr-Commit-Position: refs/heads/master@{#35118}
parent 2bcbd1e8
......@@ -31,10 +31,9 @@ function RegExpGetUnicode() {
}
throw MakeTypeError(kRegExpNonRegExp, "RegExp.prototype.unicode");
}
return !!REGEXP_UNICODE(this);
return TO_BOOLEAN(REGEXP_UNICODE(this));
}
%FunctionSetName(RegExpGetUnicode, "RegExp.prototype.unicode");
%SetNativeFlag(RegExpGetUnicode);
%SetForceInlineFlag(RegExpGetUnicode);
utils.InstallGetter(GlobalRegExp.prototype, 'unicode', RegExpGetUnicode);
......
......@@ -267,8 +267,12 @@ function RegExpExecJS(string) {
// ES#sec-regexpexec Runtime Semantics: RegExpExec ( R, S )
function RegExpSubclassExec(regexp, string) {
var exec = regexp.exec;
// Also takes an optional exec method in case our caller
// has already fetched exec.
function RegExpSubclassExec(regexp, string, exec) {
if (IS_UNDEFINED(exec)) {
exec = regexp.exec;
}
if (IS_CALLABLE(exec)) {
var result = %_Call(exec, regexp, string);
if (!IS_RECEIVER(result) && !IS_NULL(result)) {
......@@ -278,6 +282,7 @@ function RegExpSubclassExec(regexp, string) {
}
return %_Call(RegExpExecJS, regexp, string);
}
%SetForceInlineFlag(RegExpSubclassExec);
// One-element cache for the simplified test regexp.
......@@ -483,6 +488,20 @@ function RegExpSubclassSplit(string, limit) {
string = TO_STRING(string);
var constructor = SpeciesConstructor(this, GlobalRegExp);
var flags = TO_STRING(this.flags);
// TODO(adamk): this fast path is wrong with respect to this.global
// and this.sticky, but hopefully the spec will remove those gets
// and thus make the assumption of 'exec' having no side-effects
// more correct. Also, we doesn't ensure that 'exec' is actually
// a data property on RegExp.prototype.
var exec;
if (IS_REGEXP(this) && constructor === GlobalRegExp) {
exec = this.exec;
if (exec === RegExpSubclassExecJS) {
return %_Call(RegExpSplit, this, string, limit);
}
}
var unicode = %StringIndexOf(flags, 'u', 0) >= 0;
var sticky = %StringIndexOf(flags, 'y', 0) >= 0;
var newFlags = sticky ? flags : flags + "y";
......@@ -502,7 +521,9 @@ function RegExpSubclassSplit(string, limit) {
var stringIndex = prevStringIndex;
while (stringIndex < size) {
splitter.lastIndex = stringIndex;
result = RegExpSubclassExec(splitter, string);
result = RegExpSubclassExec(splitter, string, exec);
// Ensure exec will be read again on the next loop through.
exec = UNDEFINED;
if (IS_NULL(result)) {
stringIndex += AdvanceStringIndex(string, stringIndex, unicode);
} else {
......@@ -561,20 +582,23 @@ function RegExpSubclassMatch(string) {
if (!global) return RegExpSubclassExec(this, string);
var unicode = this.unicode;
this.lastIndex = 0;
var array = [];
var array = new InternalArray();
var n = 0;
var result;
while (true) {
result = RegExpSubclassExec(this, string);
if (IS_NULL(result)) {
if (n === 0) return null;
return array;
break;
}
var matchStr = TO_STRING(result[0]);
%AddElement(array, n, matchStr);
array[n] = matchStr;
if (matchStr === "") SetAdvancedStringIndex(this, string, unicode);
n++;
}
var resultArray = [];
%MoveArrayContents(array, resultArray);
return resultArray;
}
%FunctionRemovePrototype(RegExpSubclassMatch);
......@@ -871,15 +895,32 @@ function RegExpSubclassReplace(string, replace) {
var length = string.length;
var functionalReplace = IS_CALLABLE(replace);
if (!functionalReplace) replace = TO_STRING(replace);
var global = this.global;
var global = TO_BOOLEAN(this.global);
if (global) {
var unicode = this.unicode;
var unicode = TO_BOOLEAN(this.unicode);
this.lastIndex = 0;
}
// TODO(adamk): this fast path is wrong with respect to this.global
// and this.sticky, but hopefully the spec will remove those gets
// and thus make the assumption of 'exec' having no side-effects
// more correct. Also, we doesn't ensure that 'exec' is actually
// a data property on RegExp.prototype, nor does the fast path
// correctly handle lastIndex setting.
var exec;
if (IS_REGEXP(this)) {
exec = this.exec;
if (exec === RegExpSubclassExecJS) {
return %_Call(RegExpReplace, this, string, replace);
}
}
var results = new InternalArray();
var result, replacement;
while (true) {
result = RegExpSubclassExec(this, string);
result = RegExpSubclassExec(this, string, exec);
// Ensure exec will be read again on the next loop through.
exec = UNDEFINED;
if (IS_NULL(result)) {
break;
} else {
......@@ -1046,8 +1087,9 @@ function RegExpGetGlobal() {
}
throw MakeTypeError(kRegExpNonRegExp, "RegExp.prototype.global");
}
return !!REGEXP_GLOBAL(this);
return TO_BOOLEAN(REGEXP_GLOBAL(this));
}
%SetForceInlineFlag(RegExpGetGlobal);
// ES6 21.2.5.5.
......@@ -1060,7 +1102,7 @@ function RegExpGetIgnoreCase() {
}
throw MakeTypeError(kRegExpNonRegExp, "RegExp.prototype.ignoreCase");
}
return !!REGEXP_IGNORE_CASE(this);
return TO_BOOLEAN(REGEXP_IGNORE_CASE(this));
}
......@@ -1074,7 +1116,7 @@ function RegExpGetMultiline() {
}
throw MakeTypeError(kRegExpNonRegExp, "RegExp.prototype.multiline");
}
return !!REGEXP_MULTILINE(this);
return TO_BOOLEAN(REGEXP_MULTILINE(this));
}
......@@ -1098,8 +1140,9 @@ function RegExpGetSticky() {
}
throw MakeTypeError(kRegExpNonRegExp, "RegExp.prototype.sticky");
}
return !!REGEXP_STICKY(this);
return TO_BOOLEAN(REGEXP_STICKY(this));
}
%SetForceInlineFlag(RegExpGetSticky);
// -------------------------------------------------------------------
......
......@@ -99,25 +99,43 @@
# https://code.google.com/p/v8/issues/detail?id=4253
'language/asi/S7.9_A5.7_T1': [PASS, FAIL_OK],
# https://code.google.com/p/v8/issues/detail?id=4602
###### BEGIN REGEXP SUBCLASSING SECTION ######
# https://code.google.com/p/v8/issues/detail?id=4602
# Fails due to mismatching [[OriginalFlags]] and getters
'built-ins/RegExp/prototype/exec/get-sticky-coerce': [FAIL],
'built-ins/RegExp/prototype/exec/get-sticky-err': [FAIL],
'built-ins/RegExp/prototype/test/get-sticky-err': [FAIL],
'built-ins/RegExp/prototype/Symbol.match/coerce-sticky': [FAIL],
'built-ins/RegExp/prototype/Symbol.replace/get-sticky-coerce': [FAIL],
'built-ins/RegExp/prototype/Symbol.replace/coerce-global': [FAIL],
'built-ins/RegExp/prototype/Symbol.replace/coerce-unicode': [FAIL],
'built-ins/RegExp/prototype/Symbol.search/get-sticky-coerce': [FAIL],
# https://code.google.com/p/v8/issues/detail?id=4305
# SKIP rather than FAIL some tests, as they may check for an exception which
# happens to be thrown for some other reason (e.g,
# built-ins/RegExp/prototype/Symbol.match/builtin-failure-set-lastindex-err)
'built-ins/RegExp/prototype/Symbol.match/*': [SKIP],
# Missing lastIndex support
'built-ins/RegExp/prototype/Symbol.split/str-result-coerce-length-err': [FAIL],
# https://code.google.com/p/v8/issues/detail?id=4343
'built-ins/RegExp/prototype/Symbol.replace/*': [SKIP],
# Times out
'built-ins/RegExp/prototype/Symbol.split/str-coerce-lastindex': [SKIP],
# https://code.google.com/p/v8/issues/detail?id=4344
'built-ins/RegExp/prototype/Symbol.search/*': [SKIP],
# Sticky support busted
'built-ins/RegExp/prototype/Symbol.replace/y-init-lastindex': [FAIL],
'built-ins/RegExp/prototype/Symbol.replace/y-set-lastindex': [FAIL],
# SKIP rather than FAIL, as the test checks for an exception which
# happens to be thrown for some other reason.
'built-ins/RegExp/prototype/Symbol.split/str-result-get-length-err': [SKIP],
# https://code.google.com/p/v8/issues/detail?id=4345
# Spec change in progress: https://github.com/tc39/ecma262/issues/489
'built-ins/RegExp/prototype/Symbol.replace/get-sticky-err': [SKIP],
# Skip everything that will fail without the --harmony-regexp-exec flag.
# These lines should be removed when that flag is staged.
'built-ins/RegExp/prototype/Symbol.match/*': [SKIP],
'built-ins/RegExp/prototype/Symbol.replace/*': [SKIP],
'built-ins/RegExp/prototype/Symbol.search/*': [SKIP],
'built-ins/RegExp/prototype/Symbol.split/*': [SKIP],
'built-ins/RegExp/prototype/exec/get-sticky-err': [SKIP],
'built-ins/RegExp/prototype/test/get-sticky-err': [SKIP],
#
###### END REGEXP SUBCLASSING SECTION ######
# https://code.google.com/p/v8/issues/detail?id=4360
'intl402/Collator/10.1.1_1': [FAIL],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment