From a637f453850cb5063978105d336333ee39b32b51 Mon Sep 17 00:00:00 2001 From: "sgjesse@chromium.org" Date: Tue, 20 Oct 2009 12:13:31 +0000 Subject: [PATCH] Fix issue 475 The check for arguments in registers in one of the three versions of GenericBinaryOpStub::GenerateCall was plain wrong. BUG=475 TEST=mjsunit/regress/regress-475.js Review URL: http://codereview.chromium.org/307002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3092 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/ia32/codegen-ia32.cc | 8 ++++---- test/mjsunit/regress/regress-475.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 test/mjsunit/regress/regress-475.js diff --git a/src/ia32/codegen-ia32.cc b/src/ia32/codegen-ia32.cc index 938c8e6..ce48e9d 100644 --- a/src/ia32/codegen-ia32.cc +++ b/src/ia32/codegen-ia32.cc @@ -6531,7 +6531,7 @@ void GenericBinaryOpStub::GenerateCall( Register left, Register right) { if (!ArgsInRegistersSupported()) { - // Only pass arguments in registers if there is no smi code in the stub. + // Pass arguments on the stack. __ push(left); __ push(right); } else { @@ -6584,7 +6584,7 @@ void GenericBinaryOpStub::GenerateCall( Register left, Smi* right) { if (!ArgsInRegistersSupported()) { - // Only pass arguments in registers if there is no smi code in the stub. + // Pass arguments on the stack. __ push(left); __ push(Immediate(right)); } else { @@ -6612,8 +6612,8 @@ void GenericBinaryOpStub::GenerateCall( MacroAssembler* masm, Smi* left, Register right) { - if (flags_ != NO_SMI_CODE_IN_STUB) { - // Only pass arguments in registers if there is no smi code in the stub. + if (!ArgsInRegistersSupported()) { + // Pass arguments on the stack. __ push(Immediate(left)); __ push(right); } else { diff --git a/test/mjsunit/regress/regress-475.js b/test/mjsunit/regress/regress-475.js new file mode 100644 index 0000000..4b7dbbd --- /dev/null +++ b/test/mjsunit/regress/regress-475.js @@ -0,0 +1,28 @@ +// Copyright 2009 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. + +assertEquals(1, (function (){return 1|-1%1})()); -- 2.7.4