Reviewers: Jakob,
Description:
Merged r11518, r11519 into trunk branch.
Fix unsigned-Smi check in MappedArgumentsLookup
Fix crash bug in VisitChoice
BUG=chromium:126414,chromium:126272
[email protected]
TEST=test/mjsunit/regress/regress-crbug-126414.js
Please review this at https://chromiumcodereview.appspot.com/10310041/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files:
M src/arm/ic-arm.cc
M src/ia32/ic-ia32.cc
M src/jsregexp.cc
M src/mips/ic-mips.cc
M src/version.cc
M test/mjsunit/regexp-capture-3.js
A test/mjsunit/regress/regress-crbug-126414.js
Index: src/arm/ic-arm.cc
diff --git a/src/arm/ic-arm.cc b/src/arm/ic-arm.cc
index
e84365789be42805a1d3e91eb76c6b93f3298f81..c88c25709247c40e5764fc2603c911ee6aa808ac
100644
--- a/src/arm/ic-arm.cc
+++ b/src/arm/ic-arm.cc
@@ -774,7 +774,7 @@ static MemOperand
GenerateMappedArgumentsLookup(MacroAssembler* masm,
__ b(lt, slow_case);
// Check that the key is a positive smi.
- __ tst(key, Operand(0x8000001));
+ __ tst(key, Operand(0x80000001));
__ b(ne, slow_case);
// Load the elements into scratch1 and check its map.
Index: src/ia32/ic-ia32.cc
diff --git a/src/ia32/ic-ia32.cc b/src/ia32/ic-ia32.cc
index
d4f85cc38b16ed666f249161e97e4bdffc4d7693..a591af125e76725bf1ab922220c08c2efc121746
100644
--- a/src/ia32/ic-ia32.cc
+++ b/src/ia32/ic-ia32.cc
@@ -383,7 +383,7 @@ static Operand
GenerateMappedArgumentsLookup(MacroAssembler* masm,
__ j(below, slow_case);
// Check that the key is a positive smi.
- __ test(key, Immediate(0x8000001));
+ __ test(key, Immediate(0x80000001));
__ j(not_zero, slow_case);
// Load the elements into scratch1 and check its map.
@@ -396,7 +396,7 @@ static Operand
GenerateMappedArgumentsLookup(MacroAssembler* masm,
__ mov(scratch2, FieldOperand(scratch1, FixedArray::kLengthOffset));
__ sub(scratch2, Immediate(Smi::FromInt(2)));
__ cmp(key, scratch2);
- __ j(greater_equal, unmapped_case);
+ __ j(above_equal, unmapped_case);
// Load element index and check whether it is the hole.
const int kHeaderSize = FixedArray::kHeaderSize + 2 * kPointerSize;
Index: src/jsregexp.cc
diff --git a/src/jsregexp.cc b/src/jsregexp.cc
index
54f681856d70938464996b3618dea7095e7ebf98..3455abce2399b3030a172e10ce1e2eb463f43647
100644
--- a/src/jsregexp.cc
+++ b/src/jsregexp.cc
@@ -2722,8 +2722,8 @@ RegExpNode* ChoiceNode::FilterASCII(int depth) {
GuardedAlternative alternative = alternatives_->at(i);
RegExpNode* replacement = alternative.node()->FilterASCII(depth - 1);
ASSERT(replacement != this); // No missing EMPTY_MATCH_CHECK.
- alternatives_->at(i).set_node(replacement);
if (replacement != NULL) {
+ alternatives_->at(i).set_node(replacement);
surviving++;
survivor = replacement;
}
@@ -2739,9 +2739,11 @@ RegExpNode* ChoiceNode::FilterASCII(int depth) {
ZoneList<GuardedAlternative>* new_alternatives =
new ZoneList<GuardedAlternative>(surviving);
for (int i = 0; i < choice_count; i++) {
- GuardedAlternative alternative = alternatives_->at(i);
- if (alternative.node() != NULL) {
- new_alternatives->Add(alternative);
+ RegExpNode* replacement =
+ alternatives_->at(i).node()->FilterASCII(depth - 1);
+ if (replacement != NULL) {
+ alternatives_->at(i).set_node(replacement);
+ new_alternatives->Add(alternatives_->at(i));
}
}
alternatives_ = new_alternatives;
@@ -5832,7 +5834,12 @@ RegExpEngine::CompilationResult
RegExpEngine::Compile(
node = loop_node;
}
}
- if (is_ascii) node = node->FilterASCII(RegExpCompiler::kMaxRecursion);
+ if (is_ascii) {
+ node = node->FilterASCII(RegExpCompiler::kMaxRecursion);
+ // Do it again to propagate the new nodes to places where they were not
+ // put because they had not been calculated yet.
+ if (node != NULL) node =
node->FilterASCII(RegExpCompiler::kMaxRecursion);
+ }
if (node == NULL) node = new EndNode(EndNode::BACKTRACK);
data->node = node;
Index: src/mips/ic-mips.cc
diff --git a/src/mips/ic-mips.cc b/src/mips/ic-mips.cc
index
2c4da1a886455d6edd64004ed3c18d18c111bfdc..32da2df182e2f21f783e29d52a50831591d42011
100644
--- a/src/mips/ic-mips.cc
+++ b/src/mips/ic-mips.cc
@@ -767,7 +767,7 @@ static MemOperand
GenerateMappedArgumentsLookup(MacroAssembler* masm,
__ Branch(slow_case, lt, scratch2, Operand(FIRST_JS_RECEIVER_TYPE));
// Check that the key is a positive smi.
- __ And(scratch1, key, Operand(0x8000001));
+ __ And(scratch1, key, Operand(0x80000001));
__ Branch(slow_case, ne, scratch1, Operand(zero_reg));
// Load the elements into scratch1 and check its map.
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
f9937ba6f007eb8475caa11d2bbe9e0ba13cdb95..0dda633448c707847493d8afc01f96d82df1ec7b
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 10
#define BUILD_NUMBER 8
-#define PATCH_LEVEL 3
+#define PATCH_LEVEL 4
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/regexp-capture-3.js
diff --git a/test/mjsunit/regexp-capture-3.js
b/test/mjsunit/regexp-capture-3.js
index
5cf7d8d689868d198554c025d096e0b8b093b5de..9bdd6005995172b2f2caf92d5a1de385e7505c5c
100644
--- a/test/mjsunit/regexp-capture-3.js
+++ b/test/mjsunit/regexp-capture-3.js
@@ -212,3 +212,7 @@ regex9.exec(input0);
var regex10 = new RegExp(re, "i");
regex10.exec(input0);
+
+var regex11 = /^(?:[^\u0000-\u0080]|[0-9a-z?,.!&\s#()])+$/i;
+regex11.exec(input0);
+
Index: test/mjsunit/regress/regress-crbug-126414.js
diff --git a/test/mjsunit/regress/regress-crbug-126414.js
b/test/mjsunit/regress/regress-crbug-126414.js
new file mode 100644
index
0000000000000000000000000000000000000000..6674267d74d386f5434cb51935cb76a7c84c5734
--- /dev/null
+++ b/test/mjsunit/regress/regress-crbug-126414.js
@@ -0,0 +1,32 @@
+// Copyright 2012 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.
+
+function foo(bar) {
+ return arguments[bar];
+}
+foo(0); // Handled in runtime.
+foo(-536870912); // Triggers bug.
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
