From 628875475e80c9358238b1b75caf6aa06ea23fe2 Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Thu, 25 Apr 2013 07:36:59 +0000 Subject: [PATCH] Fix overflow check in mul-i which was missing since r14322 Review URL: https://codereview.chromium.org/14471012 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14430 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/hydrogen-instructions.cc | 2 +- test/mjsunit/regress/regress-mul-canoverflow.js | 45 +++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-mul-canoverflow.js diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc index 9c8d9d8..d6710a4 100644 --- a/src/hydrogen-instructions.cc +++ b/src/hydrogen-instructions.cc @@ -1451,7 +1451,7 @@ HValue* HSub::Canonicalize() { HValue* HMul::Canonicalize() { if (IsIdentityOperation(left(), right(), 1)) return left(); if (IsIdentityOperation(right(), left(), 1)) return right(); - return HArithmeticBinaryOperation::Canonicalize(); + return this; } diff --git a/test/mjsunit/regress/regress-mul-canoverflow.js b/test/mjsunit/regress/regress-mul-canoverflow.js new file mode 100644 index 0000000..e3e21ca --- /dev/null +++ b/test/mjsunit/regress/regress-mul-canoverflow.js @@ -0,0 +1,45 @@ +// 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 boom(a) { + return ((a | 0) * (a | 0)) | 0; +} +function boom_unoptimized(a) { + try {} catch(_) {} + return ((a | 0) * (a | 0)) | 0; +} + +boom(1, 1); +boom(2, 2); + +%OptimizeFunctionOnNextCall(boom); +var big_int = 0x5F00000F; +var expected = boom_unoptimized(big_int); +var actual = boom(big_int) +assertEquals(expected, actual); -- 2.7.4