From fdfbdfbcf50635aac6200d28005d5a4a35df3ade Mon Sep 17 00:00:00 2001 From: "lrn@chromium.org" Date: Thu, 10 Feb 2011 16:43:01 +0000 Subject: [PATCH] Fix typo in ASSERT in object-verifier for RegExp. BUG=v8::1129 TEST=test/mjsunit/regress/regress-1129.js Review URL: http://codereview.chromium.org/6476027 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6735 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/objects-debug.cc | 2 +- test/mjsunit/regress/regress-1129.js | 44 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-1129.js diff --git a/src/objects-debug.cc b/src/objects-debug.cc index c8246c86c9..c1caef2d98 100644 --- a/src/objects-debug.cc +++ b/src/objects-debug.cc @@ -440,7 +440,7 @@ void JSRegExp::JSRegExpVerify() { ASSERT(ascii_data->IsTheHole() || ascii_data->IsJSObject() || (is_native ? ascii_data->IsCode() : ascii_data->IsByteArray())); Object* uc16_data = arr->get(JSRegExp::kIrregexpUC16CodeIndex); - ASSERT(uc16_data->IsTheHole() || ascii_data->IsJSObject() || + ASSERT(uc16_data->IsTheHole() || uc16_data->IsJSObject() || (is_native ? uc16_data->IsCode() : uc16_data->IsByteArray())); ASSERT(arr->get(JSRegExp::kIrregexpCaptureCountIndex)->IsSmi()); ASSERT(arr->get(JSRegExp::kIrregexpMaxRegisterCountIndex)->IsSmi()); diff --git a/test/mjsunit/regress/regress-1129.js b/test/mjsunit/regress/regress-1129.js new file mode 100644 index 0000000000..37bf9a81c5 --- /dev/null +++ b/test/mjsunit/regress/regress-1129.js @@ -0,0 +1,44 @@ +// Copyright 2011 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. + +// Flags: --verify-heap --expose-gc + +// This should not hit an assertion in debug mode. + +// Create RegExp that is syntactically correct, but throws a stack overflow +// during compilation. +var source = Array(50000).join("(") + "a" + Array(50000).join(")"); +var r = RegExp(source); +try { + // Try to compile in UC16 mode, and drop the exception. + r.test("\x80"); + assertUnreachable(); +} catch (e) { +} + +// Trigger a heap validation. +gc();