From 7f8a918f08a0270ba737e4cd8529a8d40afcca76 Mon Sep 17 00:00:00 2001 From: "ricow@chromium.org" Date: Wed, 11 May 2011 08:53:46 +0000 Subject: [PATCH] Allow strict mode flag as extraicstate for keyed external array store ic We currently hit an assertion in computeflags, but the extra_ic_state is used to pass the strict mode flag in. BUG: 1383 Review URL: http://codereview.chromium.org/7003022 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7847 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/objects-inl.h | 3 ++- test/mjsunit/regress/regress-1383.js | 40 ++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-1383.js diff --git a/src/objects-inl.h b/src/objects-inl.h index e3d21cc..9a38584 100644 --- a/src/objects-inl.h +++ b/src/objects-inl.h @@ -2785,7 +2785,8 @@ Code::Flags Code::ComputeFlags(Kind kind, (kind == CALL_IC && (ic_state == MONOMORPHIC || ic_state == MONOMORPHIC_PROTOTYPE_FAILURE)) || (kind == STORE_IC) || - (kind == KEYED_STORE_IC)); + (kind == KEYED_STORE_IC) || + (kind == KEYED_EXTERNAL_ARRAY_STORE_IC)); // Compute the bit mask. int bits = kind << kFlagsKindShift; if (in_loop) bits |= kFlagsICInLoopMask; diff --git a/test/mjsunit/regress/regress-1383.js b/test/mjsunit/regress/regress-1383.js new file mode 100644 index 0000000..4b08f5a --- /dev/null +++ b/test/mjsunit/regress/regress-1383.js @@ -0,0 +1,40 @@ +// Copyright 2011 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. + +// Test that passing the strict_mode flag in extra ic state from +// StubCache::ComputeKeyedLoadOrStoreExternalArray does not +// hit an assertion in Code::ComputeFlags. + +x=""; +function foo(){ + "use strict"; + var wxemsx=(4); + var wxemsx_0=Float32Array(wxemsx); + wxemsx_0[0]={}; +} + +foo() -- 2.7.4