From aa83f2900a7976342b0f7e86cb46a559e5298e6e Mon Sep 17 00:00:00 2001 From: "bmeurer@chromium.org" Date: Mon, 2 Dec 2013 13:12:07 +0000 Subject: [PATCH] Fix invalid assertion with OSR in BuildBinaryOperation. BUG=v8:3032 LOG=n R=yangguo@chromium.org Review URL: https://codereview.chromium.org/98623004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18190 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/hydrogen.cc | 6 ++++-- test/mjsunit/regress/regress-3032.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100755 test/mjsunit/regress/regress-3032.js diff --git a/src/hydrogen.cc b/src/hydrogen.cc index 76c5ca0..900e07e 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -8858,8 +8858,10 @@ HValue* HGraphBuilder::BuildBinaryOperation( case Token::MOD: { if (fixed_right_arg.has_value) { if (right->IsConstant()) { - ASSERT_EQ(fixed_right_arg.value, - HConstant::cast(right)->Integer32Value()); + HConstant* c_right = HConstant::cast(right); + if (c_right->HasInteger32Value()) { + ASSERT_EQ(fixed_right_arg.value, c_right->Integer32Value()); + } } else { HConstant* fixed_right = Add( static_cast(fixed_right_arg.value)); diff --git a/test/mjsunit/regress/regress-3032.js b/test/mjsunit/regress/regress-3032.js new file mode 100755 index 0000000..ae54543 --- /dev/null +++ b/test/mjsunit/regress/regress-3032.js @@ -0,0 +1,30 @@ +// 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. + +for (var i = 0; i < 1000000; i++) { } +var xl = 4096; +var z = i % xl; -- 2.7.4