From 37443768bf6dceb09f8403f0842e613e3778c584 Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Tue, 19 Nov 2013 12:59:09 +0000 Subject: [PATCH] Fix register trashing in Emit*ByteSeqStringSetChar This is currently not observable without --allow-natives-syntax because all internal usages are safe, but it deserves to be fixed nonetheless. BUG=chromium:320922 LOG=N R=yangguo@chromium.org Review URL: https://codereview.chromium.org/67103003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17873 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm/full-codegen-arm.cc | 4 +-- src/ia32/full-codegen-ia32.cc | 6 ++-- src/mips/full-codegen-mips.cc | 4 +-- src/x64/full-codegen-x64.cc | 4 +-- test/mjsunit/regress/regress-crbug-320922.js | 48 ++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 test/mjsunit/regress/regress-crbug-320922.js diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc index 0cb8e46..136101b 100644 --- a/src/arm/full-codegen-arm.cc +++ b/src/arm/full-codegen-arm.cc @@ -3520,8 +3520,8 @@ void FullCodeGenerator::EmitOneByteSeqStringSetChar(CallRuntime* expr) { VisitForStackValue(args->at(1)); // index VisitForStackValue(args->at(2)); // value - __ Pop(index, value); VisitForAccumulatorValue(args->at(0)); // string + __ Pop(index, value); if (FLAG_debug_code) { static const uint32_t one_byte_seq_type = kSeqStringTag | kOneByteStringTag; @@ -3547,8 +3547,8 @@ void FullCodeGenerator::EmitTwoByteSeqStringSetChar(CallRuntime* expr) { VisitForStackValue(args->at(1)); // index VisitForStackValue(args->at(2)); // value - __ Pop(index, value); VisitForAccumulatorValue(args->at(0)); // string + __ Pop(index, value); if (FLAG_debug_code) { static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag; diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc index 24cb13f..a1236ed 100644 --- a/src/ia32/full-codegen-ia32.cc +++ b/src/ia32/full-codegen-ia32.cc @@ -3476,10 +3476,10 @@ void FullCodeGenerator::EmitOneByteSeqStringSetChar(CallRuntime* expr) { VisitForStackValue(args->at(1)); // index VisitForStackValue(args->at(2)); // value - __ pop(value); - __ pop(index); VisitForAccumulatorValue(args->at(0)); // string + __ pop(value); + __ pop(index); if (FLAG_debug_code) { static const uint32_t one_byte_seq_type = kSeqStringTag | kOneByteStringTag; @@ -3504,9 +3504,9 @@ void FullCodeGenerator::EmitTwoByteSeqStringSetChar(CallRuntime* expr) { VisitForStackValue(args->at(1)); // index VisitForStackValue(args->at(2)); // value + VisitForAccumulatorValue(args->at(0)); // string __ pop(value); __ pop(index); - VisitForAccumulatorValue(args->at(0)); // string if (FLAG_debug_code) { static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag; diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc index a9cf791..1859bc8 100644 --- a/src/mips/full-codegen-mips.cc +++ b/src/mips/full-codegen-mips.cc @@ -3549,8 +3549,8 @@ void FullCodeGenerator::EmitOneByteSeqStringSetChar(CallRuntime* expr) { VisitForStackValue(args->at(1)); // index VisitForStackValue(args->at(2)); // value - __ Pop(index, value); VisitForAccumulatorValue(args->at(0)); // string + __ Pop(index, value); if (FLAG_debug_code) { static const uint32_t one_byte_seq_type = kSeqStringTag | kOneByteStringTag; @@ -3578,8 +3578,8 @@ void FullCodeGenerator::EmitTwoByteSeqStringSetChar(CallRuntime* expr) { VisitForStackValue(args->at(1)); // index VisitForStackValue(args->at(2)); // value - __ Pop(index, value); VisitForAccumulatorValue(args->at(0)); // string + __ Pop(index, value); if (FLAG_debug_code) { static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag; diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc index d5fa5e5..7d0d00a 100644 --- a/src/x64/full-codegen-x64.cc +++ b/src/x64/full-codegen-x64.cc @@ -3441,9 +3441,9 @@ void FullCodeGenerator::EmitOneByteSeqStringSetChar(CallRuntime* expr) { VisitForStackValue(args->at(1)); // index VisitForStackValue(args->at(2)); // value + VisitForAccumulatorValue(args->at(0)); // string __ pop(value); __ pop(index); - VisitForAccumulatorValue(args->at(0)); // string if (FLAG_debug_code) { static const uint32_t one_byte_seq_type = kSeqStringTag | kOneByteStringTag; @@ -3468,9 +3468,9 @@ void FullCodeGenerator::EmitTwoByteSeqStringSetChar(CallRuntime* expr) { VisitForStackValue(args->at(1)); // index VisitForStackValue(args->at(2)); // value + VisitForAccumulatorValue(args->at(0)); // string __ pop(value); __ pop(index); - VisitForAccumulatorValue(args->at(0)); // string if (FLAG_debug_code) { static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag; diff --git a/test/mjsunit/regress/regress-crbug-320922.js b/test/mjsunit/regress/regress-crbug-320922.js new file mode 100644 index 0000000..4a5b581 --- /dev/null +++ b/test/mjsunit/regress/regress-crbug-320922.js @@ -0,0 +1,48 @@ +// 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. + +// Flags: --allow-natives-syntax + +var string = "hello world"; +var expected = "Hello " + "world"; +function Capitalize() { + %_OneByteSeqStringSetChar(string, 0, 0x48); +} +Capitalize(); +assertEquals(expected, string); +Capitalize(); +assertEquals(expected, string); + +var twobyte = "\u20ACello world"; + +function TwoByteCapitalize() { + %_TwoByteSeqStringSetChar(twobyte, 0, 0x48); +} +TwoByteCapitalize(); +assertEquals(expected, twobyte); +TwoByteCapitalize(); +assertEquals(expected, twobyte); -- 2.7.4