diff --git a/src/code-stub-assembler.h b/src/code-stub-assembler.h index 76fd86eb91..488b009aa4 100644 --- a/src/code-stub-assembler.h +++ b/src/code-stub-assembler.h @@ -21,7 +21,7 @@ class StubCache; enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol }; #define HEAP_CONSTANT_LIST(V) \ - V(AccessorInfoMap, AccessorInfoMap) \ + V(AccessorPairMap, AccessorPairMap) \ V(BooleanMap, BooleanMap) \ V(CodeMap, CodeMap) \ V(empty_string, EmptyString) \ diff --git a/src/ic/keyed-store-generic.cc b/src/ic/keyed-store-generic.cc index 699cb71ac8..43eb4f1c8a 100644 --- a/src/ic/keyed-store-generic.cc +++ b/src/ic/keyed-store-generic.cc @@ -676,7 +676,7 @@ void KeyedStoreGenericAssembler::EmitGenericPropertyStore( { Label not_callable(this); Node* accessor_pair = var_accessor_pair.value(); - GotoIf(IsAccessorInfoMap(LoadMap(accessor_pair)), slow); + GotoIf(IsAccessorPairMap(LoadMap(accessor_pair)), slow); CSA_ASSERT(this, HasInstanceType(accessor_pair, ACCESSOR_PAIR_TYPE)); Node* setter = LoadObjectField(accessor_pair, AccessorPair::kSetterOffset); Node* setter_map = LoadMap(setter); diff --git a/test/mjsunit/regress/regress-crbug-668101.js b/test/mjsunit/regress/regress-crbug-668101.js deleted file mode 100644 index 5645dce071..0000000000 --- a/test/mjsunit/regress/regress-crbug-668101.js +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2016 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 f(a, i, v) { - a[i] = v; -} - -f("make it generic", 0, 0); - -var a = new Array(3); -// Fast properties. -f(a, "length", 2); -assertEquals(2, a.length); - -// Dictionary properties. -%OptimizeObjectForAddingMultipleProperties(a, 1); -f(a, "length", 1); -assertEquals(1, a.length);