From daee0d83db16d78d7c54d789cd3963aba5d1c1de Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Fri, 6 Sep 2013 15:21:38 +0000 Subject: [PATCH] Fix bitwise negation on x64 BUG=chromium:285355 R=verwaest@chromium.org Review URL: https://codereview.chromium.org/24037003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16579 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/x64/lithium-codegen-x64.cc | 2 +- test/mjsunit/regress/regress-crbug-285355.js | 43 ++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-crbug-285355.js diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc index fd9bf18..fa2a632 100644 --- a/src/x64/lithium-codegen-x64.cc +++ b/src/x64/lithium-codegen-x64.cc @@ -1425,7 +1425,7 @@ void LCodeGen::DoBitI(LBitI* instr) { break; case Token::BIT_XOR: if (right_operand == int32_t(~0)) { - __ not_(ToRegister(left)); + __ notl(ToRegister(left)); } else { __ xorl(ToRegister(left), Immediate(right_operand)); } diff --git a/test/mjsunit/regress/regress-crbug-285355.js b/test/mjsunit/regress/regress-crbug-285355.js new file mode 100644 index 0000000..ebd480a --- /dev/null +++ b/test/mjsunit/regress/regress-crbug-285355.js @@ -0,0 +1,43 @@ +// 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 + +function inverted_index() { + return ~1; +} + +%NeverOptimizeFunction(inverted_index); + +function crash(array) { + return array[~inverted_index()] = 2; +} + +assertEquals(2, crash(new Array(1))); +assertEquals(2, crash(new Array(1))); +%OptimizeFunctionOnNextCall(crash) +assertEquals(2, crash(new Array(1))); -- 2.7.4