From: danno@chromium.org Date: Mon, 25 Mar 2013 15:19:22 +0000 (+0000) Subject: Fix store_mode bug involving polymorphism with external and JS arrays. X-Git-Tag: upstream/4.7.83~14757 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dfd9ea8087e58dd07acb9e38da7b3828b51198e5;p=platform%2Fupstream%2Fv8.git Fix store_mode bug involving polymorphism with external and JS arrays. Review URL: https://codereview.chromium.org/12987014 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14064 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/ic.cc b/src/ic.cc index a9bc4d6..d85caaa 100644 --- a/src/ic.cc +++ b/src/ic.cc @@ -1772,6 +1772,26 @@ Handle KeyedStoreIC::StoreElementStub(Handle receiver, } } + // If the store mode isn't the standard mode, make sure that all polymorphic + // receivers are either external arrays, or all "normal" arrays. Otherwise, + // use the generic stub. + if (store_mode != STANDARD_STORE) { + int external_arrays = 0; + for (int i = 0; i < target_receiver_maps.length(); ++i) { + if (target_receiver_maps[i]->has_external_array_elements()) { + external_arrays++; + } + } + if (external_arrays != 0 && + external_arrays != target_receiver_maps.length()) { + TRACE_GENERIC_IC(isolate(), "KeyedIC", + "unsupported combination of external and normal arrays"); + return strict_mode == kStrictMode + ? generic_stub_strict() + : generic_stub(); + } + } + return isolate()->stub_cache()->ComputeStoreElementPolymorphic( &target_receiver_maps, store_mode, strict_mode); } diff --git a/test/mjsunit/regress/external-and-normal-array-polymorphim.js b/test/mjsunit/regress/external-and-normal-array-polymorphim.js new file mode 100644 index 0000000..59fada4 --- /dev/null +++ b/test/mjsunit/regress/external-and-normal-array-polymorphim.js @@ -0,0 +1,50 @@ +// Copyright 2010 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: --compiled_keyed_stores --compiled_transitions + +function store_generator(compare) { + return function(a,i,v) { + a[i] = v; + assertEquals(compare, a[i]); + assertEquals(compare, a[i]); + } +} + +f = store_generator(5); +a = [0,0,0]; +f(a,0,5); +a = [0,0,0]; +f(a,1,5); +a = [0,0,0]; +f(a,2,5); + +f = store_generator(5.5); +a = new Float32Array(5); +f(a,0,5.5); +f(a,1,5.5); +f(a,2,5.5);