From 196d6aeec1fcfd7e4cc06291186a65462b1f81fe Mon Sep 17 00:00:00 2001 From: binji Date: Tue, 1 Sep 2015 11:33:51 -0700 Subject: [PATCH] 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. R=jarin@chromium.org Review URL: https://codereview.chromium.org/1304163010 Cr-Commit-Position: refs/heads/master@{#30523} --- src/bootstrapper.cc | 7 ++----- src/flag-definitions.h | 1 - test/cctest/test-api.cc | 1 - test/mjsunit/asm/atomics-add.js | 2 +- test/mjsunit/asm/atomics-and.js | 2 +- test/mjsunit/asm/atomics-compareexchange.js | 2 +- test/mjsunit/asm/atomics-exchange.js | 2 +- test/mjsunit/asm/atomics-load.js | 2 +- test/mjsunit/asm/atomics-or.js | 2 +- test/mjsunit/asm/atomics-store.js | 2 +- test/mjsunit/asm/atomics-sub.js | 2 +- test/mjsunit/asm/atomics-xor.js | 2 +- test/mjsunit/d8-worker-sharedarraybuffer.js | 2 +- test/mjsunit/harmony/atomics.js | 2 +- test/mjsunit/harmony/futex.js | 2 +- test/mjsunit/regress/regress-crbug-501809.js | 2 +- 16 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc index d7b4cec6fe..65dbaebdba 100644 --- a/src/bootstrapper.cc +++ b/src/bootstrapper.cc @@ -1845,7 +1845,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) @@ -2491,9 +2490,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}; @@ -2610,7 +2607,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; diff --git a/src/flag-definitions.h b/src/flag-definitions.h index f0d8d4698d..d75f8b6643 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). diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc index 5e8d4b619a..9b12282954 100644 --- a/test/cctest/test-api.cc +++ b/test/cctest/test-api.cc @@ -21835,7 +21835,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; diff --git a/test/mjsunit/asm/atomics-add.js b/test/mjsunit/asm/atomics-add.js index 69400c8059..77dd4d8a03 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"; diff --git a/test/mjsunit/asm/atomics-and.js b/test/mjsunit/asm/atomics-and.js index e60f1f6a13..5660f508b0 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"; diff --git a/test/mjsunit/asm/atomics-compareexchange.js b/test/mjsunit/asm/atomics-compareexchange.js index 208a06043c..9f4890a98a 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"; diff --git a/test/mjsunit/asm/atomics-exchange.js b/test/mjsunit/asm/atomics-exchange.js index bb70322c7e..ed2b0fa21b 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"; diff --git a/test/mjsunit/asm/atomics-load.js b/test/mjsunit/asm/atomics-load.js index 769fb40e2c..7d27aa8d6e 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"; diff --git a/test/mjsunit/asm/atomics-or.js b/test/mjsunit/asm/atomics-or.js index df87d24d74..7ea29156e8 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"; diff --git a/test/mjsunit/asm/atomics-store.js b/test/mjsunit/asm/atomics-store.js index 1f7a5f91c7..c44dd96d59 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"; diff --git a/test/mjsunit/asm/atomics-sub.js b/test/mjsunit/asm/atomics-sub.js index f9e56ffa4b..d737811790 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"; diff --git a/test/mjsunit/asm/atomics-xor.js b/test/mjsunit/asm/atomics-xor.js index 893ea013fd..66052b3940 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"; diff --git a/test/mjsunit/d8-worker-sharedarraybuffer.js b/test/mjsunit/d8-worker-sharedarraybuffer.js index d432f97074..3fe9fdd143 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) { diff --git a/test/mjsunit/harmony/atomics.js b/test/mjsunit/harmony/atomics.js index bff9f95a81..664b46d121 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) { diff --git a/test/mjsunit/harmony/futex.js b/test/mjsunit/harmony/futex.js index c7e1f5ce2a..06c0a25ba1 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); diff --git a/test/mjsunit/regress/regress-crbug-501809.js b/test/mjsunit/regress/regress-crbug-501809.js index c3abadfab5..855b36a054 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() {;});