From 56ec59bd26cd72eac027c330e06f3c7f0c8b70a2 Mon Sep 17 00:00:00 2001 From: "rodolph.perfetta@arm.com" Date: Thu, 17 Jul 2014 09:55:48 +0000 Subject: [PATCH] ARM64: always restore regexp register cache after a C function call. BUG=v8:3444 TEST=mjsunit/regress/regress-regexp-nocase.js LOG=N R=yangguo@chromium.org Review URL: https://codereview.chromium.org/392403002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22443 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm64/regexp-macro-assembler-arm64.cc | 9 +++++--- test/mjsunit/regress/regress-regexp-nocase.js | 30 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 test/mjsunit/regress/regress-regexp-nocase.js diff --git a/src/arm64/regexp-macro-assembler-arm64.cc b/src/arm64/regexp-macro-assembler-arm64.cc index 762a7f1..88204eb 100644 --- a/src/arm64/regexp-macro-assembler-arm64.cc +++ b/src/arm64/regexp-macro-assembler-arm64.cc @@ -397,11 +397,14 @@ void RegExpMacroAssemblerARM64::CheckNotBackReferenceIgnoreCase( } // Check if function returned non-zero for success or zero for failure. - CompareAndBranchOrBacktrack(x0, 0, eq, on_no_match); + // x0 is one of the registers used as a cache so it must be tested before + // the cache is restored. + __ Cmp(x0, 0); + __ PopCPURegList(cached_registers); + BranchOrBacktrack(eq, on_no_match); + // On success, increment position by length of capture. __ Add(current_input_offset(), current_input_offset(), capture_length); - // Reset the cached registers. - __ PopCPURegList(cached_registers); } __ Bind(&fallthrough); diff --git a/test/mjsunit/regress/regress-regexp-nocase.js b/test/mjsunit/regress/regress-regexp-nocase.js new file mode 100644 index 0000000..27637da --- /dev/null +++ b/test/mjsunit/regress/regress-regexp-nocase.js @@ -0,0 +1,30 @@ +// Copyright 2014 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. + +var s = "('')x\nx\uF670"; + +assertEquals(s.match(/\((').*\1\)/i), ["('')", "'"]); -- 2.7.4