[ic] Inline cache: Prevent deopt loop for keyed store on undefined
Change-Id: I83b2181323b311fb6994c6d2bed731357079ec1d Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3892060 Commit-Queue: Matthias Liedtke <mliedtke@chromium.org> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> Cr-Commit-Position: refs/heads/main@{#83223}
This commit is contained in:
parent
caa087bb18
commit
604db85ec9
18
src/ic/ic.cc
18
src/ic/ic.cc
@ -19,6 +19,7 @@
|
||||
#include "src/execution/protectors-inl.h"
|
||||
#include "src/execution/tiering-manager.h"
|
||||
#include "src/handles/handles-inl.h"
|
||||
#include "src/handles/maybe-handles.h"
|
||||
#include "src/ic/call-optimization.h"
|
||||
#include "src/ic/handler-configuration-inl.h"
|
||||
#include "src/ic/ic-inl.h"
|
||||
@ -2571,16 +2572,19 @@ MaybeHandle<Object> KeyedStoreIC::Store(Handle<Object> object,
|
||||
}
|
||||
|
||||
DCHECK(store_handle.is_null());
|
||||
ASSIGN_RETURN_ON_EXCEPTION(
|
||||
isolate(), store_handle,
|
||||
// TODO(v8:12548): refactor DefineKeyedOwnIC as a subclass of StoreIC
|
||||
// so the logic doesn't get mixed here.
|
||||
// TODO(v8:12548): refactor DefineKeyedOwnIC as a subclass of StoreIC
|
||||
// so the logic doesn't get mixed here.
|
||||
MaybeHandle<Object> result =
|
||||
IsDefineKeyedOwnIC()
|
||||
? Runtime::DefineObjectOwnProperty(isolate(), object, key, value,
|
||||
StoreOrigin::kMaybeKeyed)
|
||||
: Runtime::SetObjectProperty(isolate(), object, key, value,
|
||||
StoreOrigin::kMaybeKeyed),
|
||||
Object);
|
||||
StoreOrigin::kMaybeKeyed);
|
||||
if (result.is_null()) {
|
||||
DCHECK(isolate()->has_pending_exception());
|
||||
set_slow_stub_reason("failed to set property");
|
||||
use_ic = false;
|
||||
}
|
||||
if (use_ic) {
|
||||
if (!old_receiver_map.is_null()) {
|
||||
if (is_arguments) {
|
||||
@ -2624,7 +2628,7 @@ MaybeHandle<Object> KeyedStoreIC::Store(Handle<Object> object,
|
||||
}
|
||||
TraceIC("StoreIC", key);
|
||||
|
||||
return store_handle;
|
||||
return result;
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
@ -1,42 +0,0 @@
|
||||
// Copyright 2022 the V8 project authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
// Flags: --allow-natives-syntax
|
||||
|
||||
function throwsRepeated(fn, ErrorType) {
|
||||
// Collect type feedback.
|
||||
%PrepareFunctionForOptimization(fn);
|
||||
for (let i = 0; i < 5; i++) assertThrows(fn, ErrorType);
|
||||
// Force compilation and run.
|
||||
%OptimizeFunctionOnNextCall(fn);
|
||||
assertThrows(fn, ErrorType);
|
||||
// If the function isn't optimized / turbofan tier not available,
|
||||
// a deopt happened on the call above.
|
||||
assertEquals(%IsTurbofanEnabled(), %ActiveTierIsTurbofan(fn));
|
||||
}
|
||||
|
||||
function repeated(fn) {
|
||||
// Collect type feedback.
|
||||
%PrepareFunctionForOptimization(fn);
|
||||
for (let i = 0; i < 5; i++) fn();
|
||||
// Force compilation and run.
|
||||
%OptimizeFunctionOnNextCall(fn);
|
||||
fn();
|
||||
// If the function isn't optimized / turbofan tier not available,
|
||||
// a deopt happened on the call above.
|
||||
assertEquals(%IsTurbofanEnabled(), %ActiveTierIsTurbofan(fn));
|
||||
}
|
||||
|
||||
repeated(() => { for (let p of "abc") { } });
|
||||
repeated(() => { for (let p of [1, 2, 3]) { } });
|
||||
throwsRepeated(() => { for (let p of {a: 1, b: 2}) { } }, TypeError);
|
||||
let objWithIterator = { [Symbol.iterator]: function* () { yield 1; } };
|
||||
repeated(() => { for (let p of objWithIterator) { } });
|
||||
throwsRepeated(() => { for (let p of 5) { } }, TypeError);
|
||||
throwsRepeated(() => { for (let p of new Number(5)) { } }, TypeError);
|
||||
throwsRepeated(() => { for (let p of true) { } }, TypeError);
|
||||
throwsRepeated(() => { for (let p of new BigInt(123)) { } }, TypeError);
|
||||
throwsRepeated(() => { for (let p of new Symbol("symbol")) { } }, TypeError);
|
||||
throwsRepeated(function testUndef() { for (let p of undefined) { } }, TypeError);
|
||||
throwsRepeated(() => { for (let p of null) { } }, TypeError);
|
61
test/mjsunit/compiler/misc-ensure-no-deopt.js
Normal file
61
test/mjsunit/compiler/misc-ensure-no-deopt.js
Normal file
@ -0,0 +1,61 @@
|
||||
// Copyright 2022 the V8 project authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
// Flags: --allow-natives-syntax
|
||||
|
||||
function throwsRepeated(fn, ErrorType, required_compilation_count) {
|
||||
for (let j = 0; j < (required_compilation_count ?? 1); j++) {
|
||||
// Collect type feedback.
|
||||
%PrepareFunctionForOptimization(fn);
|
||||
for (let i = 0; i < 5; i++) assertThrows(fn, ErrorType);
|
||||
// Force compilation and run.
|
||||
%OptimizeFunctionOnNextCall(fn);
|
||||
assertThrows(fn, ErrorType);
|
||||
}
|
||||
// If the function isn't optimized / turbofan tier not available,
|
||||
// a deopt happened on the call above.
|
||||
assertEquals(%IsTurbofanEnabled(), %ActiveTierIsTurbofan(fn));
|
||||
}
|
||||
|
||||
function repeated(fn) {
|
||||
// Collect type feedback.
|
||||
%PrepareFunctionForOptimization(fn);
|
||||
for (let i = 0; i < 2; i++) fn();
|
||||
// Force compilation and run.
|
||||
%OptimizeFunctionOnNextCall(fn);
|
||||
fn();
|
||||
// If the function isn't optimized / turbofan tier not available,
|
||||
// a deopt happened on the call above.
|
||||
assertEquals(%IsTurbofanEnabled(), %ActiveTierIsTurbofan(fn));
|
||||
}
|
||||
|
||||
repeated(() => { for (let p of "abc") { } });
|
||||
repeated(() => { for (let p of [1, 2, 3]) { } });
|
||||
throwsRepeated(() => { for (let p of {a: 1, b: 2}) { } }, TypeError);
|
||||
let objWithIterator = { [Symbol.iterator]: function* () { yield 1; } };
|
||||
repeated(() => { for (let p of objWithIterator) { } });
|
||||
throwsRepeated(() => { for (let p of 5) { } }, TypeError);
|
||||
throwsRepeated(() => { for (let p of new Number(5)) { } }, TypeError);
|
||||
throwsRepeated(() => { for (let p of true) { } }, TypeError);
|
||||
throwsRepeated(() => { for (let p of new BigInt(123)) { } }, TypeError);
|
||||
throwsRepeated(() => { for (let p of Symbol("symbol")) { } }, TypeError);
|
||||
throwsRepeated(() => { for (let p of undefined) { } }, TypeError);
|
||||
throwsRepeated(() => { for (let p of null) { } }, TypeError);
|
||||
|
||||
throwsRepeated(() => (undefined).val = undefined, TypeError);
|
||||
throwsRepeated(() => (undefined)["test"] = undefined, TypeError);
|
||||
throwsRepeated(() => (undefined)[Symbol("test")] = undefined, TypeError);
|
||||
throwsRepeated(() => (undefined)[null] = undefined, TypeError);
|
||||
throwsRepeated(() => (undefined)[undefined] = undefined, TypeError);
|
||||
throwsRepeated(() => (undefined)[0] = undefined, TypeError);
|
||||
throwsRepeated(() => (undefined)[NaN] = undefined, TypeError);
|
||||
throwsRepeated(() => (null)[0] = undefined, TypeError);
|
||||
// BigInt.asIntN() deopts once but provides a better suitable compile result
|
||||
// on the second compilation which doesn't deopt any more.
|
||||
let compiles = 2;
|
||||
throwsRepeated(() => BigInt.asIntN(2, 2), TypeError, compiles);
|
||||
throwsRepeated(() => BigInt.asIntN(2, () => {}), SyntaxError, compiles);
|
||||
throwsRepeated(() => BigInt.asIntN(2, {some: Object}), SyntaxError, compiles);
|
||||
throwsRepeated(() => BigInt.asIntN(2, Symbol("test")), TypeError, compiles);
|
||||
throwsRepeated(() => BigInt.asIntN(2, null), TypeError, compiles);
|
Loading…
Reference in New Issue
Block a user