Reviewers: Jarin,

Description:
Remove harmony-atomics flag and collapse it into sharedarraybuffer flag

Having both flags is tedious, and it is unlikely you'd ever want them
separately.

[email protected]

Please review this at https://codereview.chromium.org/1304163010/

Base URL: https://chromium.googlesource.com/v8/v8.git@master

Affected files (+15, -20 lines):
  M src/bootstrapper.cc
  M src/flag-definitions.h
  M test/cctest/test-api.cc
  M test/mjsunit/asm/atomics-add.js
  M test/mjsunit/asm/atomics-and.js
  M test/mjsunit/asm/atomics-compareexchange.js
  M test/mjsunit/asm/atomics-exchange.js
  M test/mjsunit/asm/atomics-load.js
  M test/mjsunit/asm/atomics-or.js
  M test/mjsunit/asm/atomics-store.js
  M test/mjsunit/asm/atomics-sub.js
  M test/mjsunit/asm/atomics-xor.js
  M test/mjsunit/d8-worker-sharedarraybuffer.js
  M test/mjsunit/harmony/atomics.js
  M test/mjsunit/harmony/futex.js
  M test/mjsunit/regress/regress-crbug-501809.js


Index: src/bootstrapper.cc
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index 06bd125127a11fdb6dcde79bb14f48cf5aacd356..ece3dc2d8c8b6f934fd681bafe76ed1509a0fb62 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -1844,7 +1844,6 @@ EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_destructuring)
 EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_object)
 EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_object_observe)
 EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_spread_arrays)
-EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_atomics)
 EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_new_target)
 EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_concat_spreadable)
 EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_regexps)
@@ -2490,9 +2489,7 @@ bool Genesis::InstallExperimentalNatives() {
       "native harmony-object-observe.js", nullptr};
   static const char* harmony_spread_arrays_natives[] = {nullptr};
   static const char* harmony_sharedarraybuffer_natives[] = {
-      "native harmony-sharedarraybuffer.js", NULL};
- static const char* harmony_atomics_natives[] = {"native harmony-atomics.js",
-                                                  nullptr};
+ "native harmony-sharedarraybuffer.js", "native harmony-atomics.js", NULL};
   static const char* harmony_new_target_natives[] = {nullptr};
   static const char* harmony_concat_spreadable_natives[] = {
       "native harmony-concat-spreadable.js", nullptr};
@@ -2609,7 +2606,7 @@ void Genesis::InstallBuiltinFunctionIds() {


 void Genesis::InstallExperimentalBuiltinFunctionIds() {
-  if (FLAG_harmony_atomics) {
+  if (FLAG_harmony_sharedarraybuffer) {
     struct BuiltinFunctionIds {
       const char* holder_expr;
       const char* fun_name;
Index: src/flag-definitions.h
diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index 19769f16047c29f7cc0e625a0ef8718138f3259b..2354889c13ae09cafe07fe98e2e478a2549555fe 100644
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -199,7 +199,6 @@ DEFINE_BOOL(legacy_const, true, "legacy semantics for const in sloppy mode")
   V(harmony_destructuring, "harmony destructuring")                   \
   V(harmony_default_parameters, "harmony default parameters")         \
   V(harmony_sharedarraybuffer, "harmony sharedarraybuffer")           \
-  V(harmony_atomics, "harmony atomics")                               \
   V(harmony_simd, "harmony simd")

 // Features that are complete (but still behind --harmony/es-staging flag).
Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index 76f3304317ca2050c90ed58fed8471344358b7ac..419c387f18cba4f5f03d38f95efbf6fa51d1202f 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -21833,7 +21833,6 @@ class FutexInterruptionThread : public v8::base::Thread {

 TEST(FutexInterruption) {
   i::FLAG_harmony_sharedarraybuffer = true;
-  i::FLAG_harmony_atomics = true;
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope scope(isolate);
   LocalContext env;
Index: test/mjsunit/asm/atomics-add.js
diff --git a/test/mjsunit/asm/atomics-add.js b/test/mjsunit/asm/atomics-add.js index 69400c8059eb3b2a52645f4b5f7e611d190696f2..77dd4d8a0304807fbea2ee5a9a0249a601230070 100644
--- a/test/mjsunit/asm/atomics-add.js
+++ b/test/mjsunit/asm/atomics-add.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-atomics --harmony-sharedarraybuffer
+// Flags: --harmony-sharedarraybuffer

 function Module(stdlib, foreign, heap) {
   "use asm";
Index: test/mjsunit/asm/atomics-and.js
diff --git a/test/mjsunit/asm/atomics-and.js b/test/mjsunit/asm/atomics-and.js index e60f1f6a135a8055485cc6a6d5f3391973baffc4..5660f508b0a4006d86b5c8a1f70406417d2e9df1 100644
--- a/test/mjsunit/asm/atomics-and.js
+++ b/test/mjsunit/asm/atomics-and.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-atomics --harmony-sharedarraybuffer
+// Flags: --harmony-sharedarraybuffer

 function Module(stdlib, foreign, heap) {
   "use asm";
Index: test/mjsunit/asm/atomics-compareexchange.js
diff --git a/test/mjsunit/asm/atomics-compareexchange.js b/test/mjsunit/asm/atomics-compareexchange.js index 208a06043c0390e005f2308f7959b4d3cac6bb5a..9f4890a98a698222bb7f6cc4feab59cd34a913ab 100644
--- a/test/mjsunit/asm/atomics-compareexchange.js
+++ b/test/mjsunit/asm/atomics-compareexchange.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-atomics --harmony-sharedarraybuffer
+// Flags: --harmony-sharedarraybuffer

 function Module(stdlib, foreign, heap) {
   "use asm";
Index: test/mjsunit/asm/atomics-exchange.js
diff --git a/test/mjsunit/asm/atomics-exchange.js b/test/mjsunit/asm/atomics-exchange.js index bb70322c7eff033946f900b7847f959f3685b655..ed2b0fa21b4679f7ec29bea9ac832333ec4d9cb9 100644
--- a/test/mjsunit/asm/atomics-exchange.js
+++ b/test/mjsunit/asm/atomics-exchange.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-atomics --harmony-sharedarraybuffer
+// Flags: --harmony-sharedarraybuffer

 function Module(stdlib, foreign, heap) {
   "use asm";
Index: test/mjsunit/asm/atomics-load.js
diff --git a/test/mjsunit/asm/atomics-load.js b/test/mjsunit/asm/atomics-load.js index 769fb40e2cffe5701f353918d94e07ea3aa53fd4..7d27aa8d6e14ad4d5cea3ecbb58f575a113c5288 100644
--- a/test/mjsunit/asm/atomics-load.js
+++ b/test/mjsunit/asm/atomics-load.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-atomics --harmony-sharedarraybuffer
+// Flags: --harmony-sharedarraybuffer

 function Module(stdlib, foreign, heap) {
   "use asm";
Index: test/mjsunit/asm/atomics-or.js
diff --git a/test/mjsunit/asm/atomics-or.js b/test/mjsunit/asm/atomics-or.js
index df87d24d74d3fc4ccd6363fe0b518f4e8f62fd91..7ea29156e8892e6fe31fc5f919eb3b31a79ac458 100644
--- a/test/mjsunit/asm/atomics-or.js
+++ b/test/mjsunit/asm/atomics-or.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-atomics --harmony-sharedarraybuffer
+// Flags: --harmony-sharedarraybuffer

 function Module(stdlib, foreign, heap) {
   "use asm";
Index: test/mjsunit/asm/atomics-store.js
diff --git a/test/mjsunit/asm/atomics-store.js b/test/mjsunit/asm/atomics-store.js index 1f7a5f91c7190ba8c6b17e38bf8980000c82a9db..c44dd96d5950e56ef82cd0e91dc7d26313c57764 100644
--- a/test/mjsunit/asm/atomics-store.js
+++ b/test/mjsunit/asm/atomics-store.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-atomics --harmony-sharedarraybuffer
+// Flags: --harmony-sharedarraybuffer

 function Module(stdlib, foreign, heap) {
   "use asm";
Index: test/mjsunit/asm/atomics-sub.js
diff --git a/test/mjsunit/asm/atomics-sub.js b/test/mjsunit/asm/atomics-sub.js index f9e56ffa4be482026107b9943b80da148d7606e7..d7378117906fbf94e5375a023d31b3e0bc994ef9 100644
--- a/test/mjsunit/asm/atomics-sub.js
+++ b/test/mjsunit/asm/atomics-sub.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-atomics --harmony-sharedarraybuffer
+// Flags: --harmony-sharedarraybuffer

 function Module(stdlib, foreign, heap) {
   "use asm";
Index: test/mjsunit/asm/atomics-xor.js
diff --git a/test/mjsunit/asm/atomics-xor.js b/test/mjsunit/asm/atomics-xor.js index 893ea013fdee3789b2390c6fd5244152c49a756a..66052b394096bc9e0a69203b21b6aa1e06f2cec0 100644
--- a/test/mjsunit/asm/atomics-xor.js
+++ b/test/mjsunit/asm/atomics-xor.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-atomics --harmony-sharedarraybuffer
+// Flags: --harmony-sharedarraybuffer

 function Module(stdlib, foreign, heap) {
   "use asm";
Index: test/mjsunit/d8-worker-sharedarraybuffer.js
diff --git a/test/mjsunit/d8-worker-sharedarraybuffer.js b/test/mjsunit/d8-worker-sharedarraybuffer.js index d432f970748486837bd745092bda7e59c7d2bb8e..3fe9fdd143b1eab5eabe85ff57dcf908e524a39f 100644
--- a/test/mjsunit/d8-worker-sharedarraybuffer.js
+++ b/test/mjsunit/d8-worker-sharedarraybuffer.js
@@ -25,7 +25,7 @@
 // (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: --harmony-sharedarraybuffer --harmony-atomics
+// Flags: --harmony-sharedarraybuffer

 if (this.Worker) {

Index: test/mjsunit/harmony/atomics.js
diff --git a/test/mjsunit/harmony/atomics.js b/test/mjsunit/harmony/atomics.js index bff9f95a81f51a0a652cc5fc40b869196af277f7..664b46d1219bd0a251aad334ddd7a44410e94516 100644
--- a/test/mjsunit/harmony/atomics.js
+++ b/test/mjsunit/harmony/atomics.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-atomics --harmony-sharedarraybuffer
+// Flags: --harmony-sharedarraybuffer
 //

 function toRangeWrapped(value) {
Index: test/mjsunit/harmony/futex.js
diff --git a/test/mjsunit/harmony/futex.js b/test/mjsunit/harmony/futex.js
index c7e1f5ce2a86b6fe50b9609781b1eb822f302fec..06c0a25ba12121ecb040b22753262cc9d4617979 100644
--- a/test/mjsunit/harmony/futex.js
+++ b/test/mjsunit/harmony/futex.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: --allow-natives-syntax --harmony-atomics --harmony-sharedarraybuffer
+// Flags: --allow-natives-syntax --harmony-sharedarraybuffer

 (function TestFailsWithNonSharedArray() {
   var ab = new ArrayBuffer(16);
Index: test/mjsunit/regress/regress-crbug-501809.js
diff --git a/test/mjsunit/regress/regress-crbug-501809.js b/test/mjsunit/regress/regress-crbug-501809.js index c3abadfab54e47bd22b47f374738fed29c30df96..855b36a054627d3be0918230f748ac5f9c471ad1 100644
--- a/test/mjsunit/regress/regress-crbug-501809.js
+++ b/test/mjsunit/regress/regress-crbug-501809.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-sharedarraybuffer --harmony-atomics
+// Flags: --harmony-sharedarraybuffer
 var sab = new SharedArrayBuffer(8);
 var ta = new Int32Array(sab);
 ta.__defineSetter__('length', function() {;});


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to