[symbol-as-weakmap-key] Remove --harmony-symbol-as-weakmap-key

syg · V8 LUCI CQ · commit 71ff68830279 · 2023-04-19T23:14:24.000Z
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 <syg@chromium.org> Reviewed-by: Adam Klein <adamk@chromium.org> Cr-Commit-Position: refs/heads/main@{#87180}
diff --git a/src/builtins/builtins-collections-gen.cc b/src/builtins/builtins-collections-gen.cc
@@ -429,7 +429,7 @@ TNode<IntPtrT> BaseCollectionsAssembler::EstimatedInitialSize(
       [=] { return IntPtrConstant(0); });
 }
 
-// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-canbeheldweakly-abstract-operation
+// https://tc39.es/ecma262/#sec-canbeheldweakly
 void BaseCollectionsAssembler::GotoIfCannotBeHeldWeakly(
     const TNode<Object> obj, Label* if_cannot_be_held_weakly) {
   Label check_symbol_key(this);
@@ -444,7 +444,6 @@ void BaseCollectionsAssembler::GotoIfCannotBeHeldWeakly(
          if_cannot_be_held_weakly);
   Goto(&end);
   Bind(&check_symbol_key);
-  GotoIfNot(HasHarmonySymbolAsWeakmapKeyFlag(), if_cannot_be_held_weakly);
   GotoIfNot(IsSymbolInstanceType(instance_type), if_cannot_be_held_weakly);
   TNode<Uint32T> flags = LoadSymbolFlags(CAST(obj));
   GotoIf(Word32And(flags, Symbol::IsInPublicSymbolTableBit::kMask),
diff --git a/src/builtins/builtins-weak-refs.cc b/src/builtins/builtins-weak-refs.cc
@@ -9,23 +9,19 @@
 namespace v8 {
 namespace internal {
 
-// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-finalization-registry.prototype.unregister
+// https://tc39.es/ecma262/#sec-finalization-registry.prototype.unregister
 BUILTIN(FinalizationRegistryUnregister) {
   HandleScope scope(isolate);
   const char* method_name = "FinalizationRegistry.prototype.unregister";
 
   // 1. Let finalizationGroup be the this value.
   //
-  // 2. If Type(finalizationGroup) is not Object, throw a TypeError
-  //    exception.
-  //
-  // 3. If finalizationGroup does not have a [[Cells]] internal slot,
-  //    throw a TypeError exception.
+  // 2. Perform ? RequireInternalSlot(finalizationRegistry, [[Cells]]).
   CHECK_RECEIVER(JSFinalizationRegistry, finalization_registry, method_name);
 
   Handle<Object> unregister_token = args.atOrUndefined(isolate, 1);
 
-  // 4. If CanBeHeldWeakly(unregisterToken) is false, throw a TypeError
+  // 3. If CanBeHeldWeakly(unregisterToken) is false, throw a TypeError
   // exception.
   if (!unregister_token->CanBeHeldWeakly()) {
     THROW_NEW_ERROR_RETURN_FAILURE(
diff --git a/src/builtins/finalization-registry.tq b/src/builtins/finalization-registry.tq
@@ -129,7 +129,7 @@ FinalizationRegistryConstructor(
   return finalizationRegistry;
 }
 
-// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-finalization-registry.prototype.register
+// https://tc39.es/ecma262/#sec-finalization-registry.prototype.register
 transitioning javascript builtin
 FinalizationRegistryRegister(
     js-implicit context: NativeContext, receiver: JSAny)(...arguments): JSAny {
diff --git a/src/builtins/weak-ref.tq b/src/builtins/weak-ref.tq
@@ -13,7 +13,7 @@ extern runtime JSWeakRefAddToKeptObjects(implicit context: Context)(
 
 namespace weakref {
 
-// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-weak-ref-target
+// https://tc39.es/ecma262/#sec-weak-ref-target
 transitioning javascript builtin
 WeakRefConstructor(
     js-implicit context: NativeContext, receiver: JSAny, newTarget: JSAny,
diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
@@ -2716,12 +2716,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
         ExternalReference::address_of_shared_string_table_flag());
   }
 
-  TNode<BoolT> HasHarmonySymbolAsWeakmapKeyFlag() {
-    return LoadRuntimeFlag(
-        ExternalReference::
-            address_of_FLAG_harmony_symbol_as_weakmap_key());
-  }
-
   // True iff |object| is a Smi or a HeapNumber or a BigInt.
   TNode<BoolT> IsNumeric(TNode<Object> object);
 
diff --git a/src/codegen/external-reference.cc b/src/codegen/external-reference.cc
@@ -615,11 +615,6 @@ ExternalReference ExternalReference::address_of_log_or_trace_osr() {
   return ExternalReference(&v8_flags.log_or_trace_osr);
 }
 
-ExternalReference
-ExternalReference::address_of_FLAG_harmony_symbol_as_weakmap_key() {
-  return ExternalReference(&v8_flags.harmony_symbol_as_weakmap_key);
-}
-
 ExternalReference ExternalReference::address_of_builtin_subclassing_flag() {
   return ExternalReference(&v8_flags.builtin_subclassing);
 }
diff --git a/src/codegen/external-reference.h b/src/codegen/external-reference.h
@@ -101,8 +101,6 @@ class StatsCounter;
   V(address_of_log_or_trace_osr, "v8_flags.log_or_trace_osr")                  \
   V(address_of_FLAG_harmony_regexp_unicode_sets,                               \
     "v8_flags.harmony_regexp_unicode_sets")                                    \
-  V(address_of_FLAG_harmony_symbol_as_weakmap_key,                             \
-    "v8_flags.harmony_symbol_as_weakmap_key")                                  \
   V(address_of_builtin_subclassing_flag, "v8_flags.builtin_subclassing")       \
   V(address_of_double_abs_constant, "double_absolute_constant")                \
   V(address_of_double_neg_constant, "double_negate_constant")                  \
diff --git a/src/flags/flag-definitions.h b/src/flags/flag-definitions.h
@@ -272,7 +272,6 @@ DEFINE_IMPLICATION(harmony_rab_gsab_transfer, harmony_rab_gsab)
 // Features that are shipping (turned on by default, but internal flag remains).
 #define HARMONY_SHIPPING_BASE(V)                                       \
   V(harmony_import_assertions, "harmony import assertions")            \
-  V(harmony_symbol_as_weakmap_key, "harmony symbols as weakmap keys")  \
   V(harmony_change_array_by_copy, "harmony change-Array-by-copy")      \
   V(harmony_string_is_well_formed, "harmony String#{is,to}WellFormed") \
   V(harmony_rab_gsab,                                                  \
diff --git a/src/init/bootstrapper.cc b/src/init/bootstrapper.cc
@@ -4534,7 +4534,6 @@ void Genesis::InitializeConsole(Handle<JSObject> extras_binding) {
   void Genesis::InitializeGlobal_##id() {}
 
 EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_import_assertions)
-EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_symbol_as_weakmap_key)
 EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_rab_gsab_transfer)
 
 #ifdef V8_INTL_SUPPORT
diff --git a/src/objects/objects-inl.h b/src/objects/objects-inl.h
@@ -1286,7 +1286,7 @@ MaybeHandle<Object> Object::Share(Isolate* isolate, Handle<Object> value,
                    throw_if_cannot_be_shared);
 }
 
-// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-canbeheldweakly-abstract-operation
+// https://tc39.es/ecma262/#sec-canbeheldweakly
 bool Object::CanBeHeldWeakly() const {
   if (IsJSReceiver()) {
     // TODO(v8:12547) Shared structs and arrays should only be able to point
@@ -1297,10 +1297,7 @@ bool Object::CanBeHeldWeakly() const {
     }
     return true;
   }
-  if (v8_flags.harmony_symbol_as_weakmap_key) {
-    return IsSymbol() && !Symbol::cast(*this).is_in_public_symbol_table();
-  }
-  return false;
+  return IsSymbol() && !Symbol::cast(*this).is_in_public_symbol_table();
 }
 
 Handle<Object> ObjectHashTableShape::AsHandle(Handle<Object> key) {
diff --git a/test/inspector/debugger/object-preview-internal-properties.js b/test/inspector/debugger/object-preview-internal-properties.js
@@ -1,8 +1,6 @@
 // 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: --harmony-symbol-as-weakmap-key
 
 let {session, contextGroup, Protocol} = InspectorTest.start("Check internal properties reported in object preview.");
 
diff --git a/test/mjsunit/harmony/regress/regress-crbug-1372500.js b/test/mjsunit/harmony/regress/regress-crbug-1372500.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-symbol-as-weakmap-key --expose-gc
+// Flags: --expose-gc
 
 // Register an object in a FinalizationRegistry with a Symbol as the unregister
 // token.
diff --git a/test/mjsunit/harmony/symbol-as-weakmap-key.js b/test/mjsunit/harmony/symbol-as-weakmap-key.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-symbol-as-weakmap-key --expose-gc --allow-natives-syntax --noincremental-marking
+// Flags: --expose-gc --allow-natives-syntax --noincremental-marking
 
 (function TestWeakMapWithNonRegisteredSymbolKey() {
   const key = Symbol('123');
diff --git a/test/mjsunit/harmony/weakrefs/symbol-as-weakref-target-gc.js b/test/mjsunit/harmony/weakrefs/symbol-as-weakref-target-gc.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-symbol-as-weakmap-key --expose-gc --noincremental-marking
+// Flags: --expose-gc --noincremental-marking
 
 (async function () {
 
diff --git a/test/mjsunit/harmony/weakrefs/symbol-as-weakref-target.js b/test/mjsunit/harmony/weakrefs/symbol-as-weakref-target.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-symbol-as-weakmap-key
-
 (function TestRegisterWithSymbolTarget() {
   const fg = new FinalizationRegistry(() => { });
   fg.register(Symbol('123'), 'holdings');
diff --git a/test/mjsunit/harmony/weakrefs/symbol-in-finalizationregistry.js b/test/mjsunit/harmony/weakrefs/symbol-in-finalizationregistry.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-symbol-as-weakmap-key --expose-gc --noincremental-marking
+// Flags: --expose-gc --noincremental-marking
 
 (async function () {
 
diff --git a/test/test262/testcfg.py b/test/test262/testcfg.py
@@ -58,7 +58,6 @@
     'regexp-v-flag': '--harmony-regexp-unicode-sets',
     'array-grouping': '--harmony-array-grouping',
     'change-array-by-copy': '--harmony-change-array-by-copy',
-    'symbols-as-weakmap-keys': '--harmony-symbol-as-weakmap-key',
     'String.prototype.isWellFormed': '--harmony-string-is-well-formed',
     'String.prototype.toWellFormed': '--harmony-string-is-well-formed',
     'arraybuffer-transfer': '--harmony-rab-gsab-transfer',

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ FinalizationRegistryConstructor(`
`129`	`129`	`return finalizationRegistry;`
`130`	`130`	`}`
`131`	`131`
`132`		`-// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-finalization-registry.prototype.register`
	`132`	`+// https://tc39.es/ecma262/#sec-finalization-registry.prototype.register`
`133`	`133`	`transitioning javascript builtin`
`134`	`134`	`FinalizationRegistryRegister(`
`135`	`135`	`js-implicit context: NativeContext, receiver: JSAny)(...arguments): JSAny {`
Original file line number	Diff line number	Diff line change
`@@ -615,11 +615,6 @@ ExternalReference ExternalReference::address_of_log_or_trace_osr() {`
`615`	`615`	`return ExternalReference(&v8_flags.log_or_trace_osr);`
`616`	`616`	`}`
`617`	`617`
`618`		`-ExternalReference`
`619`		`-ExternalReference::address_of_FLAG_harmony_symbol_as_weakmap_key() {`
`620`		`- return ExternalReference(&v8_flags.harmony_symbol_as_weakmap_key);`
`621`		`-}`
`622`		`-`
`623`	`618`	`ExternalReference ExternalReference::address_of_builtin_subclassing_flag() {`
`624`	`619`	`return ExternalReference(&v8_flags.builtin_subclassing);`
`625`	`620`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1286,7 +1286,7 @@ MaybeHandle<Object> Object::Share(Isolate* isolate, Handle<Object> value,`
`1286`	`1286`	`throw_if_cannot_be_shared);`
`1287`	`1287`	`}`
`1288`	`1288`
`1289`		`-// https://tc39.es/proposal-symbols-as-weakmap-keys/#sec-canbeheldweakly-abstract-operation`
	`1289`	`+// https://tc39.es/ecma262/#sec-canbeheldweakly`
`1290`	`1290`	`bool Object::CanBeHeldWeakly() const {`
`1291`	`1291`	`if (IsJSReceiver()) {`
`1292`	`1292`	`// TODO(v8:12547) Shared structs and arrays should only be able to point`
`@@ -1297,10 +1297,7 @@ bool Object::CanBeHeldWeakly() const {`
`1297`	`1297`	`}`
`1298`	`1298`	`return true;`
`1299`	`1299`	`}`
`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();`
`1304`	`1301`	`}`
`1305`	`1302`
`1306`	`1303`	`Handle<Object> ObjectHashTableShape::AsHandle(Handle<Object> key) {`