Reviewers: Erik Corry,
Description:
RegExp: Fix caching to correctly set lastIndex.
BUG: 52801
Please review this at http://codereview.chromium.org/3389022/show
Affected files:
M src/regexp.js
A test/mjsunit/regress/regress-52801.js
Index: src/regexp.js
diff --git a/src/regexp.js b/src/regexp.js
index
566a96c3489ed6c525ac836338ae99c3dae73c74..8778b219c813c361a0cf8fffa8d0ceeac302e7fa
100644
--- a/src/regexp.js
+++ b/src/regexp.js
@@ -186,6 +186,7 @@ function RegExpExec(string) {
%_IsRegExpEquivalent(cache.regExp, this) &&
%_ObjectEquals(cache.subject, string)) {
if (cache.answerSaved) {
+ if (this.global) this.lastIndex = lastMatchInfo[CAPTURE1];
return %_RegExpCloneResult(cache.answer);
} else {
saveAnswer = true;
@@ -282,6 +283,7 @@ function RegExpTest(string) {
%_IsRegExpEquivalent(cache.regExp, this) &&
%_ObjectEquals(cache.subject, string) &&
%_ObjectEquals(cache.lastIndex, lastIndex)) {
+ if (this.global) this.lastIndex = lastMatchInfo[CAPTURE1];
return cache.answer;
}
Index: test/mjsunit/regress/regress-52801.js
diff --git a/test/mjsunit/regress/regress-52801.js
b/test/mjsunit/regress/regress-52801.js
new file mode 100644
index
0000000000000000000000000000000000000000..80cc0c73156ca3253745ae92c746e5275b99f1e2
--- /dev/null
+++ b/test/mjsunit/regress/regress-52801.js
@@ -0,0 +1,71 @@
+// Copyright 2010 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Whenever we enter a with-scope, we copy the context. This in itself is
fine
+// (contexts may escape), but when leaving a with-scope, we currently also
copy
+// the context instead of reverting to the original. This does not work
because
+// inner functions may already have been created using the original
context. In
+// the failing test case below, the inner function is run in the original
context
+// (where x is undefined), but the assignment to x after the
with-statement is
+// run in the copied context:
+
+// RegExp caching doesn't set lastIndex correctly.
+// See http://code.google.com/p/chromium/issues/detail?id=52801
+
+var re = /a/g;
+
+var str = "bbbbabbbbabbbb";
+
+// Test
+
+re.test(str);
+assertEquals(5, re.lastIndex);
+
+re.lastIndex = 0;
+re.test(str);
+assertEquals(5, re.lastIndex); // Fails if caching.
+
+re.lastIndex = 0;
+re.test(str);
+assertEquals(5, re.lastIndex); // Fails if caching.
+
+// Exec
+
+re = /a/g;
+
+re.exec(str);
+assertEquals(5, re.lastIndex);
+
+re.lastIndex = 0;
+re.exec(str);
+assertEquals(5, re.lastIndex); // Fails if caching.
+
+re.lastIndex = 0;
+re.exec(str);
+assertEquals(5, re.lastIndex); // Fails if caching.
+
+
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
