From: rossberg@chromium.org Date: Tue, 25 Mar 2014 10:57:52 +0000 (+0000) Subject: Revert "Ship promises and weak collections" X-Git-Tag: upstream/4.7.83~10025 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e1b16de2ac67b5b0d0fdf2106e71e458671684f;p=platform%2Fupstream%2Fv8.git Revert "Ship promises and weak collections" Reason: breaks Blink layout tests. R=machenbach@chromium.org BUG= Review URL: https://codereview.chromium.org/210853003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20233 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/api.cc b/src/api.cc index ef627d0..ea2edbc 100644 --- a/src/api.cc +++ b/src/api.cc @@ -5832,7 +5832,7 @@ Local Array::CloneElementAt(uint32_t index) { bool Value::IsPromise() const { i::Handle val = Utils::OpenHandle(this); - if (!val->IsJSObject()) return false; + if (!i::FLAG_harmony_promises || !val->IsJSObject()) return false; i::Handle obj = i::Handle::cast(val); i::Isolate* isolate = obj->GetIsolate(); LOG_API(isolate, "IsPromise"); diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc index b11fd01..b2a52cd 100644 --- a/src/bootstrapper.cc +++ b/src/bootstrapper.cc @@ -154,7 +154,7 @@ char* Bootstrapper::AllocateAutoDeletedArray(int bytes) { void Bootstrapper::TearDown() { if (delete_these_non_arrays_on_tear_down_ != NULL) { int len = delete_these_non_arrays_on_tear_down_->length(); - ASSERT(len < 24); // Don't use this mechanism for unbounded allocations. + ASSERT(len < 20); // Don't use this mechanism for unbounded allocations. for (int i = 0; i < len; i++) { delete delete_these_non_arrays_on_tear_down_->at(i); delete_these_non_arrays_on_tear_down_->at(i) = NULL; @@ -1114,18 +1114,6 @@ void Genesis::InitializeGlobal(Handle inner_global, native_context()->set_data_view_fun(*data_view_fun); } - { // -- W e a k M a p - InstallFunction(global, "WeakMap", JS_WEAK_MAP_TYPE, JSWeakMap::kSize, - isolate->initial_object_prototype(), - Builtins::kIllegal, true, true); - } - - { // -- W e a k S e t - InstallFunction(global, "WeakSet", JS_WEAK_SET_TYPE, JSWeakSet::kSize, - isolate->initial_object_prototype(), - Builtins::kIllegal, true, true); - } - { // --- arguments_boilerplate_ // Make sure we can recognize argument objects at runtime. // This is done by introducing an anonymous function with @@ -1373,6 +1361,19 @@ void Genesis::InitializeExperimentalGlobal() { } } + if (FLAG_harmony_weak_collections) { + { // -- W e a k M a p + InstallFunction(global, "WeakMap", JS_WEAK_MAP_TYPE, JSWeakMap::kSize, + isolate()->initial_object_prototype(), + Builtins::kIllegal, true, true); + } + { // -- W e a k S e t + InstallFunction(global, "WeakSet", JS_WEAK_SET_TYPE, JSWeakSet::kSize, + isolate()->initial_object_prototype(), + Builtins::kIllegal, true, true); + } + } + if (FLAG_harmony_generators) { // Create generator meta-objects and install them on the builtins object. Handle builtins(native_context()->builtins()); @@ -1567,7 +1568,6 @@ bool Genesis::CompileScriptCached(Isolate* isolate, void Genesis::InstallNativeFunctions() { HandleScope scope(isolate()); INSTALL_NATIVE(JSFunction, "CreateDate", create_date_fun); - INSTALL_NATIVE(JSFunction, "ToNumber", to_number_fun); INSTALL_NATIVE(JSFunction, "ToString", to_string_fun); INSTALL_NATIVE(JSFunction, "ToDetailString", to_detail_string_fun); @@ -1575,7 +1575,6 @@ void Genesis::InstallNativeFunctions() { INSTALL_NATIVE(JSFunction, "ToInteger", to_integer_fun); INSTALL_NATIVE(JSFunction, "ToUint32", to_uint32_fun); INSTALL_NATIVE(JSFunction, "ToInt32", to_int32_fun); - INSTALL_NATIVE(JSFunction, "GlobalEval", global_eval_fun); INSTALL_NATIVE(JSFunction, "Instantiate", instantiate_fun); INSTALL_NATIVE(JSFunction, "ConfigureTemplateInstance", @@ -1584,14 +1583,6 @@ void Genesis::InstallNativeFunctions() { INSTALL_NATIVE(JSObject, "functionCache", function_cache); INSTALL_NATIVE(JSFunction, "ToCompletePropertyDescriptor", to_complete_property_descriptor); - - INSTALL_NATIVE(JSFunction, "IsPromise", is_promise); - INSTALL_NATIVE(JSFunction, "PromiseCreate", promise_create); - INSTALL_NATIVE(JSFunction, "PromiseResolve", promise_resolve); - INSTALL_NATIVE(JSFunction, "PromiseReject", promise_reject); - INSTALL_NATIVE(JSFunction, "PromiseChain", promise_chain); - INSTALL_NATIVE(JSFunction, "PromiseCatch", promise_catch); - INSTALL_NATIVE(JSFunction, "NotifyChange", observers_notify_change); INSTALL_NATIVE(JSFunction, "EnqueueSpliceRecord", observers_enqueue_splice); INSTALL_NATIVE(JSFunction, "BeginPerformSplice", @@ -1606,6 +1597,15 @@ void Genesis::InstallExperimentalNativeFunctions() { INSTALL_NATIVE(JSFunction, "EnqueueExternalMicrotask", enqueue_external_microtask); + if (FLAG_harmony_promises) { + INSTALL_NATIVE(JSFunction, "IsPromise", is_promise); + INSTALL_NATIVE(JSFunction, "PromiseCreate", promise_create); + INSTALL_NATIVE(JSFunction, "PromiseResolve", promise_resolve); + INSTALL_NATIVE(JSFunction, "PromiseReject", promise_reject); + INSTALL_NATIVE(JSFunction, "PromiseChain", promise_chain); + INSTALL_NATIVE(JSFunction, "PromiseCatch", promise_catch); + } + if (FLAG_harmony_proxies) { INSTALL_NATIVE(JSFunction, "DerivedHasTrap", derived_has_trap); INSTALL_NATIVE(JSFunction, "DerivedGetTrap", derived_get_trap); @@ -2055,6 +2055,8 @@ bool Genesis::InstallExperimentalNatives() { INSTALL_EXPERIMENTAL_NATIVE(i, symbols, "symbol.js") INSTALL_EXPERIMENTAL_NATIVE(i, proxies, "proxy.js") INSTALL_EXPERIMENTAL_NATIVE(i, collections, "collection.js") + INSTALL_EXPERIMENTAL_NATIVE(i, weak_collections, "weak_collection.js") + INSTALL_EXPERIMENTAL_NATIVE(i, promises, "promise.js") INSTALL_EXPERIMENTAL_NATIVE(i, generators, "generator.js") INSTALL_EXPERIMENTAL_NATIVE(i, iteration, "array-iterator.js") INSTALL_EXPERIMENTAL_NATIVE(i, strings, "harmony-string.js") diff --git a/src/flag-definitions.h b/src/flag-definitions.h index ba5b154..2d2cadf 100644 --- a/src/flag-definitions.h +++ b/src/flag-definitions.h @@ -175,9 +175,12 @@ DEFINE_bool(harmony_modules, false, "enable harmony modules (implies block scoping)") DEFINE_bool(harmony_symbols, false, "enable harmony symbols (a.k.a. private names)") +DEFINE_bool(harmony_promises, false, "enable harmony promises") DEFINE_bool(harmony_proxies, false, "enable harmony proxies") DEFINE_bool(harmony_collections, false, - "enable harmony collections (sets, maps)") + "enable harmony collections (sets, maps, weak sets, weak maps)") +DEFINE_bool(harmony_weak_collections, false, + "enable only harmony weak collections (weak sets and maps)") DEFINE_bool(harmony_generators, false, "enable harmony generators") DEFINE_bool(harmony_iteration, false, "enable harmony iteration (for-of)") DEFINE_bool(harmony_numeric_literals, false, @@ -197,10 +200,14 @@ DEFINE_implication(harmony, harmony_iteration) DEFINE_implication(harmony, harmony_numeric_literals) DEFINE_implication(harmony, harmony_strings) DEFINE_implication(harmony, harmony_arrays) +DEFINE_implication(harmony_collections, harmony_weak_collections) +DEFINE_implication(harmony_promises, harmony_weak_collections) DEFINE_implication(harmony_modules, harmony_scoping) DEFINE_implication(harmony, es_staging) DEFINE_implication(es_staging, harmony_maths) +DEFINE_implication(es_staging, harmony_promises) +DEFINE_implication(es_staging, harmony_weak_collections) // Flags for experimental implementation features. DEFINE_bool(packed_arrays, true, "optimizes arrays that have no holes") diff --git a/src/promise.js b/src/promise.js index 63f5629..23e5125 100644 --- a/src/promise.js +++ b/src/promise.js @@ -34,19 +34,7 @@ // var $WeakMap = global.WeakMap -var $Promise = function Promise(resolver) { - if (resolver === promiseRaw) return; - if (!%_IsConstructCall()) throw MakeTypeError('not_a_promise', [this]); - if (typeof resolver !== 'function') - throw MakeTypeError('resolver_not_a_function', [resolver]); - var promise = PromiseInit(this); - try { - resolver(function(x) { PromiseResolve(promise, x) }, - function(r) { PromiseReject(promise, r) }); - } catch (e) { - PromiseReject(promise, e); - } -} +var $Promise = Promise; //------------------------------------------------------------------- @@ -64,6 +52,20 @@ function IsPromise(x) { return IS_SPEC_OBJECT(x) && %HasLocalProperty(x, promiseStatus); } +function Promise(resolver) { + if (resolver === promiseRaw) return; + if (!%_IsConstructCall()) throw MakeTypeError('not_a_promise', [this]); + if (typeof resolver !== 'function') + throw MakeTypeError('resolver_not_a_function', [resolver]); + var promise = PromiseInit(this); + try { + resolver(function(x) { PromiseResolve(promise, x) }, + function(r) { PromiseReject(promise, r) }); + } catch (e) { + PromiseReject(promise, e); + } +} + function PromiseSet(promise, status, value, onResolve, onReject) { SET_PRIVATE(promise, promiseStatus, status); SET_PRIVATE(promise, promiseValue, value); @@ -97,7 +99,7 @@ function PromiseReject(promise, r) { function PromiseNopResolver() {} function PromiseCreate() { - return new $Promise(PromiseNopResolver) + return new Promise(PromiseNopResolver) } @@ -106,7 +108,7 @@ function PromiseCreate() { function PromiseDeferred() { if (this === $Promise) { // Optimized case, avoid extra closure. - var promise = PromiseInit(new $Promise(promiseRaw)); + var promise = PromiseInit(new Promise(promiseRaw)); return { promise: promise, resolve: function(x) { PromiseResolve(promise, x) }, @@ -125,7 +127,7 @@ function PromiseDeferred() { function PromiseResolved(x) { if (this === $Promise) { // Optimized case, avoid extra closure. - return PromiseSet(new $Promise(promiseRaw), +1, x); + return PromiseSet(new Promise(promiseRaw), +1, x); } else { return new this(function(resolve, reject) { resolve(x) }); } @@ -134,7 +136,7 @@ function PromiseResolved(x) { function PromiseRejected(r) { if (this === $Promise) { // Optimized case, avoid extra closure. - return PromiseSet(new $Promise(promiseRaw), -1, r); + return PromiseSet(new Promise(promiseRaw), -1, r); } else { return new this(function(resolve, reject) { reject(r) }); } @@ -304,8 +306,9 @@ function PromiseOne(values) { //------------------------------------------------------------------- function SetUpPromise() { - %CheckIsBootstrapping(); - %SetProperty(global, "Promise", $Promise, NONE); + %CheckIsBootstrapping() + var global_receiver = %GlobalReceiver(global); + global_receiver.Promise = $Promise; InstallFunctions($Promise, DONT_ENUM, [ "defer", PromiseDeferred, "accept", PromiseResolved, diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc index ffc8652..12f846e 100644 --- a/test/cctest/test-api.cc +++ b/test/cctest/test-api.cc @@ -22191,6 +22191,8 @@ TEST(EventLogging) { TEST(Promises) { + i::FLAG_harmony_promises = true; + LocalContext context; v8::Isolate* isolate = context->GetIsolate(); v8::HandleScope scope(isolate); diff --git a/test/cctest/test-microtask-delivery.cc b/test/cctest/test-microtask-delivery.cc index 0172726..108337a 100644 --- a/test/cctest/test-microtask-delivery.cc +++ b/test/cctest/test-microtask-delivery.cc @@ -36,6 +36,7 @@ namespace { class HarmonyIsolate { public: HarmonyIsolate() { + i::FLAG_harmony_promises = true; isolate_ = Isolate::New(); isolate_->Enter(); } diff --git a/test/mjsunit/debug-script.js b/test/mjsunit/debug-script.js index 80d423e..1a7283c 100644 --- a/test/mjsunit/debug-script.js +++ b/test/mjsunit/debug-script.js @@ -59,7 +59,7 @@ for (i = 0; i < scripts.length; i++) { } // This has to be updated if the number of native scripts change. -assertTrue(named_native_count == 19 || named_native_count == 20); +assertTrue(named_native_count == 17 || named_native_count == 18); // Only the 'gc' extension is loaded. assertEquals(1, extension_count); // This script and mjsunit.js has been loaded. If using d8, d8 loads diff --git a/test/mjsunit/es6/promises.js b/test/mjsunit/es6/promises.js index 0470f39..48b96f6 100644 --- a/test/mjsunit/es6/promises.js +++ b/test/mjsunit/es6/promises.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: --allow-natives-syntax +// Flags: --harmony-promises --allow-natives-syntax var asyncAssertsExpected = 0; diff --git a/test/mjsunit/es6/regress/regress-2034.js b/test/mjsunit/es6/regress/regress-2034.js index 5c738bf..1b7dac0 100644 --- a/test/mjsunit/es6/regress/regress-2034.js +++ b/test/mjsunit/es6/regress/regress-2034.js @@ -25,6 +25,8 @@ // (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-weak-collections + var key = {}; var map = new WeakMap; Object.preventExtensions(key); diff --git a/test/mjsunit/es6/regress/regress-2156.js b/test/mjsunit/es6/regress/regress-2156.js index fba2a29..a34e381 100644 --- a/test/mjsunit/es6/regress/regress-2156.js +++ b/test/mjsunit/es6/regress/regress-2156.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: --allow-natives-syntax +// Flags: --allow-natives-syntax --harmony-weak-collections var key1 = {}; var key2 = {}; diff --git a/test/mjsunit/es6/regress/regress-2829.js b/test/mjsunit/es6/regress/regress-2829.js index b48039c..8d8f3f8 100644 --- a/test/mjsunit/es6/regress/regress-2829.js +++ b/test/mjsunit/es6/regress/regress-2829.js @@ -25,6 +25,8 @@ // (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-weak-collections + (function test1() { var wm1 = new WeakMap(); wm1.set(Object.prototype, 23); diff --git a/test/mjsunit/es6/weak_collections.js b/test/mjsunit/es6/weak_collections.js index 74235e7..af23903 100644 --- a/test/mjsunit/es6/weak_collections.js +++ b/test/mjsunit/es6/weak_collections.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: --expose-gc --allow-natives-syntax +// Flags: --harmony-weak-collections --expose-gc --allow-natives-syntax // Note: this test is superseded by harmony/collections.js. @@ -225,7 +225,7 @@ function TestPrototype(C) { assertTrue(C.prototype instanceof Object); assertEquals({ value: {}, - writable: false, + writable: true, // TODO(2793): This should be non-writable. enumerable: false, configurable: false }, Object.getOwnPropertyDescriptor(C, "prototype")); diff --git a/test/mjsunit/es7/object-observe.js b/test/mjsunit/es7/object-observe.js index f5e84a6..0aa3601 100644 --- a/test/mjsunit/es7/object-observe.js +++ b/test/mjsunit/es7/object-observe.js @@ -25,7 +25,8 @@ // (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-proxies --harmony-collections +// Flags: --harmony-observation --harmony-proxies +// Flags: --harmony-collections --harmony-weak-collections // Flags: --harmony-symbols --allow-natives-syntax var allObservers = []; diff --git a/test/mjsunit/harmony/collections.js b/test/mjsunit/harmony/collections.js index 804a320..b33d080 100644 --- a/test/mjsunit/harmony/collections.js +++ b/test/mjsunit/harmony/collections.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-collections +// Flags: --harmony-collections --harmony-weak-collections // Flags: --expose-gc --allow-natives-syntax @@ -290,20 +290,19 @@ assertEquals("WeakSet", WeakSet.name); // Test prototype property of Set, Map, WeakMap and WeakSet. -// TODO(2793): Should all be non-writable, and the extra flag removed. -function TestPrototype(C, writable) { +function TestPrototype(C) { assertTrue(C.prototype instanceof Object); assertEquals({ value: {}, - writable: writable, + writable: true, // TODO(2793): This should be non-writable. enumerable: false, configurable: false }, Object.getOwnPropertyDescriptor(C, "prototype")); } -TestPrototype(Set, true); -TestPrototype(Map, true); -TestPrototype(WeakMap, false); -TestPrototype(WeakSet, false); +TestPrototype(Set); +TestPrototype(Map); +TestPrototype(WeakMap); +TestPrototype(WeakSet); // Test constructor property of the Set, Map, WeakMap and WeakSet prototype. diff --git a/test/mjsunit/es6/microtask-delivery.js b/test/mjsunit/harmony/microtask-delivery.js similarity index 98% rename from test/mjsunit/es6/microtask-delivery.js rename to test/mjsunit/harmony/microtask-delivery.js index f74385e..566a39d 100644 --- a/test/mjsunit/es6/microtask-delivery.js +++ b/test/mjsunit/harmony/microtask-delivery.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: --allow-natives-syntax +// Flags: --harmony-observation --harmony-promises --allow-natives-syntax var ordering = []; function reset() { diff --git a/test/mjsunit/harmony/private.js b/test/mjsunit/harmony/private.js index 2257998..a14afe0 100644 --- a/test/mjsunit/harmony/private.js +++ b/test/mjsunit/harmony/private.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-symbols --harmony-collections +// Flags: --harmony-symbols --harmony-collections --harmony-weak-collections // Flags: --expose-gc --allow-natives-syntax var symbols = [] diff --git a/test/mjsunit/harmony/proxies-hash.js b/test/mjsunit/harmony/proxies-hash.js index 789de35..6f0b19f 100644 --- a/test/mjsunit/harmony/proxies-hash.js +++ b/test/mjsunit/harmony/proxies-hash.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-proxies --harmony-collections +// Flags: --harmony-proxies --harmony-collections --harmony-weak-collections // Helper. diff --git a/test/mjsunit/harmony/regress/regress-observe-empty-double-array.js b/test/mjsunit/harmony/regress/regress-observe-empty-double-array.js index 301ece7..4b65169 100644 --- a/test/mjsunit/harmony/regress/regress-observe-empty-double-array.js +++ b/test/mjsunit/harmony/regress/regress-observe-empty-double-array.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: --allow-natives-syntax +// Flags: --harmony-observation --allow-natives-syntax // // Test passes if it does not crash. diff --git a/test/mjsunit/harmony/symbols.js b/test/mjsunit/harmony/symbols.js index 2204392..e7bf360 100644 --- a/test/mjsunit/harmony/symbols.js +++ b/test/mjsunit/harmony/symbols.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-symbols --harmony-collections +// Flags: --harmony-symbols --harmony-collections --harmony-weak-collections // Flags: --expose-gc --allow-natives-syntax var symbols = [] diff --git a/test/mjsunit/regress/regress-crbug-350864.js b/test/mjsunit/regress/regress-crbug-350864.js index 8a793cb..15b3242 100644 --- a/test/mjsunit/regress/regress-crbug-350864.js +++ b/test/mjsunit/regress/regress-crbug-350864.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-symbols +// Flags: --harmony_symbols --harmony-weak-collections var v0 = new WeakMap; var v1 = {}; diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp index f33f487..be2dfd3 100644 --- a/tools/gyp/v8.gyp +++ b/tools/gyp/v8.gyp @@ -1061,8 +1061,6 @@ '../../src/regexp.js', '../../src/arraybuffer.js', '../../src/typedarray.js', - '../../src/weak_collection.js', - '../../src/promise.js', '../../src/object-observe.js', '../../src/macros.py', ], @@ -1071,6 +1069,8 @@ '../../src/symbol.js', '../../src/proxy.js', '../../src/collection.js', + '../../src/weak_collection.js', + '../../src/promise.js', '../../src/generator.js', '../../src/array-iterator.js', '../../src/harmony-string.js',