Skip to content

Commit 71ff688

Browse files
sygV8 LUCI CQ
syg
authored and
V8 LUCI CQ
committed
[symbol-as-weakmap-key] Remove --harmony-symbol-as-weakmap-key
The proposal has shipped since Nov 2022. Bug: v8:12947 Change-Id: Ibb2e9cf1d22e4b754ec7625ae38175fc96007255 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4451066 Commit-Queue: Shu-yu Guo <[email protected]> Reviewed-by: Adam Klein <[email protected]> Cr-Commit-Position: refs/heads/main@{#87180}
1 parent 75f0591 commit 71ff688

17 files changed

+12
-40
lines changed

‎src/builtins/builtins-collections-gen.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ TNode<IntPtrT> BaseCollectionsAssembler::EstimatedInitialSize(
429429
[=] { return IntPtrConstant(0); });
430430
}
431431

432-
// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-canbeheldweakly-abstract-operation
432+
// https://tc39.es/ecma262/#sec-canbeheldweakly
433433
void BaseCollectionsAssembler::GotoIfCannotBeHeldWeakly(
434434
const TNode<Object> obj, Label* if_cannot_be_held_weakly) {
435435
Label check_symbol_key(this);
@@ -444,7 +444,6 @@ void BaseCollectionsAssembler::GotoIfCannotBeHeldWeakly(
444444
if_cannot_be_held_weakly);
445445
Goto(&end);
446446
Bind(&check_symbol_key);
447-
GotoIfNot(HasHarmonySymbolAsWeakmapKeyFlag(), if_cannot_be_held_weakly);
448447
GotoIfNot(IsSymbolInstanceType(instance_type), if_cannot_be_held_weakly);
449448
TNode<Uint32T> flags = LoadSymbolFlags(CAST(obj));
450449
GotoIf(Word32And(flags, Symbol::IsInPublicSymbolTableBit::kMask),

‎src/builtins/builtins-weak-refs.cc

+3-7
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,19 @@
99
namespace v8 {
1010
namespace internal {
1111

12-
// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-finalization-registry.prototype.unregister
12+
// https://tc39.es/ecma262/#sec-finalization-registry.prototype.unregister
1313
BUILTIN(FinalizationRegistryUnregister) {
1414
HandleScope scope(isolate);
1515
const char* method_name = "FinalizationRegistry.prototype.unregister";
1616

1717
// 1. Let finalizationGroup be the this value.
1818
//
19-
// 2. If Type(finalizationGroup) is not Object, throw a TypeError
20-
// exception.
21-
//
22-
// 3. If finalizationGroup does not have a [[Cells]] internal slot,
23-
// throw a TypeError exception.
19+
// 2. Perform ? RequireInternalSlot(finalizationRegistry, [[Cells]]).
2420
CHECK_RECEIVER(JSFinalizationRegistry, finalization_registry, method_name);
2521

2622
Handle<Object> unregister_token = args.atOrUndefined(isolate, 1);
2723

28-
// 4. If CanBeHeldWeakly(unregisterToken) is false, throw a TypeError
24+
// 3. If CanBeHeldWeakly(unregisterToken) is false, throw a TypeError
2925
// exception.
3026
if (!unregister_token->CanBeHeldWeakly()) {
3127
THROW_NEW_ERROR_RETURN_FAILURE(

‎src/builtins/finalization-registry.tq

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ FinalizationRegistryConstructor(
129129
return finalizationRegistry;
130130
}
131131

132-
// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-finalization-registry.prototype.register
132+
// https://tc39.es/ecma262/#sec-finalization-registry.prototype.register
133133
transitioning javascript builtin
134134
FinalizationRegistryRegister(
135135
js-implicit context: NativeContext, receiver: JSAny)(...arguments): JSAny {

‎src/builtins/weak-ref.tq

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extern runtime JSWeakRefAddToKeptObjects(implicit context: Context)(
1313

1414
namespace weakref {
1515

16-
// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-weak-ref-target
16+
// https://tc39.es/ecma262/#sec-weak-ref-target
1717
transitioning javascript builtin
1818
WeakRefConstructor(
1919
js-implicit context: NativeContext, receiver: JSAny, newTarget: JSAny,

‎src/codegen/code-stub-assembler.h

-6
Original file line numberDiff line numberDiff line change
@@ -2716,12 +2716,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
27162716
ExternalReference::address_of_shared_string_table_flag());
27172717
}
27182718

2719-
TNode<BoolT> HasHarmonySymbolAsWeakmapKeyFlag() {
2720-
return LoadRuntimeFlag(
2721-
ExternalReference::
2722-
address_of_FLAG_harmony_symbol_as_weakmap_key());
2723-
}
2724-
27252719
// True iff |object| is a Smi or a HeapNumber or a BigInt.
27262720
TNode<BoolT> IsNumeric(TNode<Object> object);
27272721

‎src/codegen/external-reference.cc

-5
Original file line numberDiff line numberDiff line change
@@ -615,11 +615,6 @@ ExternalReference ExternalReference::address_of_log_or_trace_osr() {
615615
return ExternalReference(&v8_flags.log_or_trace_osr);
616616
}
617617

618-
ExternalReference
619-
ExternalReference::address_of_FLAG_harmony_symbol_as_weakmap_key() {
620-
return ExternalReference(&v8_flags.harmony_symbol_as_weakmap_key);
621-
}
622-
623618
ExternalReference ExternalReference::address_of_builtin_subclassing_flag() {
624619
return ExternalReference(&v8_flags.builtin_subclassing);
625620
}

‎src/codegen/external-reference.h

-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ class StatsCounter;
101101
V(address_of_log_or_trace_osr, "v8_flags.log_or_trace_osr") \
102102
V(address_of_FLAG_harmony_regexp_unicode_sets, \
103103
"v8_flags.harmony_regexp_unicode_sets") \
104-
V(address_of_FLAG_harmony_symbol_as_weakmap_key, \
105-
"v8_flags.harmony_symbol_as_weakmap_key") \
106104
V(address_of_builtin_subclassing_flag, "v8_flags.builtin_subclassing") \
107105
V(address_of_double_abs_constant, "double_absolute_constant") \
108106
V(address_of_double_neg_constant, "double_negate_constant") \

‎src/flags/flag-definitions.h

-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ DEFINE_IMPLICATION(harmony_rab_gsab_transfer, harmony_rab_gsab)
272272
// Features that are shipping (turned on by default, but internal flag remains).
273273
#define HARMONY_SHIPPING_BASE(V) \
274274
V(harmony_import_assertions, "harmony import assertions") \
275-
V(harmony_symbol_as_weakmap_key, "harmony symbols as weakmap keys") \
276275
V(harmony_change_array_by_copy, "harmony change-Array-by-copy") \
277276
V(harmony_string_is_well_formed, "harmony String#{is,to}WellFormed") \
278277
V(harmony_rab_gsab, \

‎src/init/bootstrapper.cc

-1
Original file line numberDiff line numberDiff line change
@@ -4534,7 +4534,6 @@ void Genesis::InitializeConsole(Handle<JSObject> extras_binding) {
45344534
void Genesis::InitializeGlobal_##id() {}
45354535

45364536
EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_import_assertions)
4537-
EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_symbol_as_weakmap_key)
45384537
EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_rab_gsab_transfer)
45394538

45404539
#ifdef V8_INTL_SUPPORT

‎src/objects/objects-inl.h

+2-5
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,7 @@ MaybeHandle<Object> Object::Share(Isolate* isolate, Handle<Object> value,
12861286
throw_if_cannot_be_shared);
12871287
}
12881288

1289-
// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-canbeheldweakly-abstract-operation
1289+
// https://tc39.es/ecma262/#sec-canbeheldweakly
12901290
bool Object::CanBeHeldWeakly() const {
12911291
if (IsJSReceiver()) {
12921292
// TODO(v8:12547) Shared structs and arrays should only be able to point
@@ -1297,10 +1297,7 @@ bool Object::CanBeHeldWeakly() const {
12971297
}
12981298
return true;
12991299
}
1300-
if (v8_flags.harmony_symbol_as_weakmap_key) {
1301-
return IsSymbol() && !Symbol::cast(*this).is_in_public_symbol_table();
1302-
}
1303-
return false;
1300+
return IsSymbol() && !Symbol::cast(*this).is_in_public_symbol_table();
13041301
}
13051302

13061303
Handle<Object> ObjectHashTableShape::AsHandle(Handle<Object> key) {

‎test/inspector/debugger/object-preview-internal-properties.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright 2016 the V8 project authors. All rights reserved.
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
4-
//
5-
// Flags: --harmony-symbol-as-weakmap-key
64

75
let {session, contextGroup, Protocol} = InspectorTest.start("Check internal properties reported in object preview.");
86

‎test/mjsunit/harmony/regress/regress-crbug-1372500.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
// Flags: --harmony-symbol-as-weakmap-key --expose-gc
5+
// Flags: --expose-gc
66

77
// Register an object in a FinalizationRegistry with a Symbol as the unregister
88
// token.

‎test/mjsunit/harmony/symbol-as-weakmap-key.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
// Flags: --harmony-symbol-as-weakmap-key --expose-gc --allow-natives-syntax --noincremental-marking
5+
// Flags: --expose-gc --allow-natives-syntax --noincremental-marking
66

77
(function TestWeakMapWithNonRegisteredSymbolKey() {
88
const key = Symbol('123');

‎test/mjsunit/harmony/weakrefs/symbol-as-weakref-target-gc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
// Flags: --harmony-symbol-as-weakmap-key --expose-gc --noincremental-marking
5+
// Flags: --expose-gc --noincremental-marking
66

77
(async function () {
88

‎test/mjsunit/harmony/weakrefs/symbol-as-weakref-target.js

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
// Flags: --harmony-symbol-as-weakmap-key
6-
75
(function TestRegisterWithSymbolTarget() {
86
const fg = new FinalizationRegistry(() => { });
97
fg.register(Symbol('123'), 'holdings');

‎test/mjsunit/harmony/weakrefs/symbol-in-finalizationregistry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
// Flags: --harmony-symbol-as-weakmap-key --expose-gc --noincremental-marking
5+
// Flags: --expose-gc --noincremental-marking
66

77
(async function () {
88

‎test/test262/testcfg.py

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
'regexp-v-flag': '--harmony-regexp-unicode-sets',
5959
'array-grouping': '--harmony-array-grouping',
6060
'change-array-by-copy': '--harmony-change-array-by-copy',
61-
'symbols-as-weakmap-keys': '--harmony-symbol-as-weakmap-key',
6261
'String.prototype.isWellFormed': '--harmony-string-is-well-formed',
6362
'String.prototype.toWellFormed': '--harmony-string-is-well-formed',
6463
'arraybuffer-transfer': '--harmony-rab-gsab-transfer',

0 commit comments

Comments
 (0)