From b807f4f82fe3fe9559818dd61c4876e6d99ed09f Mon Sep 17 00:00:00 2001 From: "mvstanton@chromium.org" Date: Fri, 6 Dec 2013 09:43:07 +0000 Subject: [PATCH] Bugfix: HCheckInstanceType::GetCheckMaskAndTag used an incorrect mask. The mask to check for an internalized string was incorrectly formed. Hat tip to Weiliang Lin for discovering the bug. BUG=v8:3038 LOG=N R=yangguo@chromium.org Review URL: https://codereview.chromium.org/108033002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18265 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/hydrogen-instructions.cc | 2 +- .../regress/internalized-string-not-equal.js | 40 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/internalized-string-not-equal.js diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc index 3ab9576..1ed8df7 100644 --- a/src/hydrogen-instructions.cc +++ b/src/hydrogen-instructions.cc @@ -1533,7 +1533,7 @@ void HCheckInstanceType::GetCheckMaskAndTag(uint8_t* mask, uint8_t* tag) { *tag = kStringTag; return; case IS_INTERNALIZED_STRING: - *mask = kIsNotInternalizedMask; + *mask = kIsNotStringMask | kIsNotInternalizedMask; *tag = kInternalizedTag; return; default: diff --git a/test/mjsunit/regress/internalized-string-not-equal.js b/test/mjsunit/regress/internalized-string-not-equal.js new file mode 100644 index 0000000..911279b --- /dev/null +++ b/test/mjsunit/regress/internalized-string-not-equal.js @@ -0,0 +1,40 @@ +// 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 + +// A bug in r15773, when masks for internalized string and string types +// were reorganized. +function equal(o1, o2) { + return (o1 == o2); +} +var a = "abc"; +var b = "abc"; +equal(a, b); +equal(a, b); +%OptimizeFunctionOnNextCall(equal); +assertTrue(equal(1.3, 1.3)); -- 2.7.4