From: yangguo@chromium.org Date: Thu, 5 Sep 2013 14:32:49 +0000 (+0000) Subject: Fix bug in regexp result object construction. X-Git-Tag: upstream/4.7.83~12642 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9659da6f48c267f39bff85f5f2b839e6d2a1801;p=platform%2Fupstream%2Fv8.git Fix bug in regexp result object construction. R=verwaest@chromium.org BUG= Review URL: https://codereview.chromium.org/23548018 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16556 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/runtime.cc b/src/runtime.cc index f51b687..9e44b58 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -2469,7 +2469,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_RegExpConstructResult) { } Object* new_object; { MaybeObject* maybe_new_object = - isolate->heap()->AllocateFixedArrayWithHoles(elements_count); + isolate->heap()->AllocateFixedArray(elements_count); if (!maybe_new_object->ToObject(&new_object)) return maybe_new_object; } FixedArray* elements = FixedArray::cast(new_object); diff --git a/test/mjsunit/regress/regress-regexp-construct-result.js b/test/mjsunit/regress/regress-regexp-construct-result.js new file mode 100644 index 0000000..84bdd20 --- /dev/null +++ b/test/mjsunit/regress/regress-regexp-construct-result.js @@ -0,0 +1,45 @@ +// Copyright 2013 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. + +// Create a huge regexp with many alternative capture groups, most of +// which do not capture anything, but the corresponding capture slot +// in the result object has to exist, even though filled with undefined. +// Having a large result array helps stressing GC. + +var num_captures = 1000; +var regexp_string = "(a)"; +for (var i = 0; i < num_captures - 1; i++) { + regexp_string += "|(b)"; +} +var regexp = new RegExp(regexp_string); + +for (var i = 0; i < 10; i++) { + var matches = regexp.exec("a"); + var count = 0; + matches.forEach(function() { count++; }); + assertEquals(num_captures + 1, count); +}