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
This commit is contained in:
parent
062f0b0b21
commit
37443768bf
@ -3520,8 +3520,8 @@ void FullCodeGenerator::EmitOneByteSeqStringSetChar(CallRuntime* expr) {
|
|||||||
|
|
||||||
VisitForStackValue(args->at(1)); // index
|
VisitForStackValue(args->at(1)); // index
|
||||||
VisitForStackValue(args->at(2)); // value
|
VisitForStackValue(args->at(2)); // value
|
||||||
__ Pop(index, value);
|
|
||||||
VisitForAccumulatorValue(args->at(0)); // string
|
VisitForAccumulatorValue(args->at(0)); // string
|
||||||
|
__ Pop(index, value);
|
||||||
|
|
||||||
if (FLAG_debug_code) {
|
if (FLAG_debug_code) {
|
||||||
static const uint32_t one_byte_seq_type = kSeqStringTag | kOneByteStringTag;
|
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(1)); // index
|
||||||
VisitForStackValue(args->at(2)); // value
|
VisitForStackValue(args->at(2)); // value
|
||||||
__ Pop(index, value);
|
|
||||||
VisitForAccumulatorValue(args->at(0)); // string
|
VisitForAccumulatorValue(args->at(0)); // string
|
||||||
|
__ Pop(index, value);
|
||||||
|
|
||||||
if (FLAG_debug_code) {
|
if (FLAG_debug_code) {
|
||||||
static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag;
|
static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag;
|
||||||
|
@ -3476,10 +3476,10 @@ void FullCodeGenerator::EmitOneByteSeqStringSetChar(CallRuntime* expr) {
|
|||||||
|
|
||||||
VisitForStackValue(args->at(1)); // index
|
VisitForStackValue(args->at(1)); // index
|
||||||
VisitForStackValue(args->at(2)); // value
|
VisitForStackValue(args->at(2)); // value
|
||||||
__ pop(value);
|
|
||||||
__ pop(index);
|
|
||||||
VisitForAccumulatorValue(args->at(0)); // string
|
VisitForAccumulatorValue(args->at(0)); // string
|
||||||
|
|
||||||
|
__ pop(value);
|
||||||
|
__ pop(index);
|
||||||
|
|
||||||
if (FLAG_debug_code) {
|
if (FLAG_debug_code) {
|
||||||
static const uint32_t one_byte_seq_type = kSeqStringTag | kOneByteStringTag;
|
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(1)); // index
|
||||||
VisitForStackValue(args->at(2)); // value
|
VisitForStackValue(args->at(2)); // value
|
||||||
|
VisitForAccumulatorValue(args->at(0)); // string
|
||||||
__ pop(value);
|
__ pop(value);
|
||||||
__ pop(index);
|
__ pop(index);
|
||||||
VisitForAccumulatorValue(args->at(0)); // string
|
|
||||||
|
|
||||||
if (FLAG_debug_code) {
|
if (FLAG_debug_code) {
|
||||||
static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag;
|
static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag;
|
||||||
|
@ -3549,8 +3549,8 @@ void FullCodeGenerator::EmitOneByteSeqStringSetChar(CallRuntime* expr) {
|
|||||||
|
|
||||||
VisitForStackValue(args->at(1)); // index
|
VisitForStackValue(args->at(1)); // index
|
||||||
VisitForStackValue(args->at(2)); // value
|
VisitForStackValue(args->at(2)); // value
|
||||||
__ Pop(index, value);
|
|
||||||
VisitForAccumulatorValue(args->at(0)); // string
|
VisitForAccumulatorValue(args->at(0)); // string
|
||||||
|
__ Pop(index, value);
|
||||||
|
|
||||||
if (FLAG_debug_code) {
|
if (FLAG_debug_code) {
|
||||||
static const uint32_t one_byte_seq_type = kSeqStringTag | kOneByteStringTag;
|
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(1)); // index
|
||||||
VisitForStackValue(args->at(2)); // value
|
VisitForStackValue(args->at(2)); // value
|
||||||
__ Pop(index, value);
|
|
||||||
VisitForAccumulatorValue(args->at(0)); // string
|
VisitForAccumulatorValue(args->at(0)); // string
|
||||||
|
__ Pop(index, value);
|
||||||
|
|
||||||
if (FLAG_debug_code) {
|
if (FLAG_debug_code) {
|
||||||
static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag;
|
static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag;
|
||||||
|
@ -3441,9 +3441,9 @@ void FullCodeGenerator::EmitOneByteSeqStringSetChar(CallRuntime* expr) {
|
|||||||
|
|
||||||
VisitForStackValue(args->at(1)); // index
|
VisitForStackValue(args->at(1)); // index
|
||||||
VisitForStackValue(args->at(2)); // value
|
VisitForStackValue(args->at(2)); // value
|
||||||
|
VisitForAccumulatorValue(args->at(0)); // string
|
||||||
__ pop(value);
|
__ pop(value);
|
||||||
__ pop(index);
|
__ pop(index);
|
||||||
VisitForAccumulatorValue(args->at(0)); // string
|
|
||||||
|
|
||||||
if (FLAG_debug_code) {
|
if (FLAG_debug_code) {
|
||||||
static const uint32_t one_byte_seq_type = kSeqStringTag | kOneByteStringTag;
|
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(1)); // index
|
||||||
VisitForStackValue(args->at(2)); // value
|
VisitForStackValue(args->at(2)); // value
|
||||||
|
VisitForAccumulatorValue(args->at(0)); // string
|
||||||
__ pop(value);
|
__ pop(value);
|
||||||
__ pop(index);
|
__ pop(index);
|
||||||
VisitForAccumulatorValue(args->at(0)); // string
|
|
||||||
|
|
||||||
if (FLAG_debug_code) {
|
if (FLAG_debug_code) {
|
||||||
static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag;
|
static const uint32_t two_byte_seq_type = kSeqStringTag | kTwoByteStringTag;
|
||||||
|
48
test/mjsunit/regress/regress-crbug-320922.js
Normal file
48
test/mjsunit/regress/regress-crbug-320922.js
Normal file
@ -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);
|
Loading…
Reference in New Issue
Block a user