Revision: 21301
Author: [email protected]
Date: Wed May 14 10:44:34 2014 UTC
Log: Drop thenable coercion cache
[email protected]
BUG=372788
LOG=Y
Review URL: https://codereview.chromium.org/281753004
http://code.google.com/p/v8/source/detail?r=21301
Added:
/branches/bleeding_edge/test/mjsunit/es6/regress/regress-cr372788.js
Modified:
/branches/bleeding_edge/include/v8.h
/branches/bleeding_edge/src/promise.js
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/es6/regress/regress-cr372788.js
Wed May 14 10:44:34 2014 UTC
@@ -0,0 +1,45 @@
+// Copyright 2014 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (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
+
+var x = 0;
+var y = 0;
+
+var thenable = { then: function(f) { x++; f(); } };
+
+for (var i = 0; i < 3; ++i) {
+ Promise.resolve(thenable).then(function() { x++; y++; });
+}
+assertEquals(0, x);
+
+(function check() {
+ Promise.resolve().chain(function() {
+ // Delay check until all handlers have run.
+ if (y < 3) check(); else assertEquals(6, x);
+ }).catch(function(e) { %AbortJS("FAILURE: " + e) });
+})();
=======================================
--- /branches/bleeding_edge/include/v8.h Wed May 14 08:34:05 2014 UTC
+++ /branches/bleeding_edge/include/v8.h Wed May 14 10:44:34 2014 UTC
@@ -1040,9 +1040,9 @@
BufferPolicy buffer_policy;
private:
- // Prevent copying. Not implemented.
- CachedData(const CachedData&);
- CachedData& operator=(const CachedData&);
+ // Prevent copying. Not implemented.
+ CachedData(const CachedData&);
+ CachedData& operator=(const CachedData&);
};
/**
@@ -1065,7 +1065,7 @@
private:
friend class ScriptCompiler;
- // Prevent copying. Not implemented.
+ // Prevent copying. Not implemented.
Source(const Source&);
Source& operator=(const Source&);
=======================================
--- /branches/bleeding_edge/src/promise.js Tue May 6 14:48:34 2014 UTC
+++ /branches/bleeding_edge/src/promise.js Wed May 14 10:44:34 2014 UTC
@@ -203,8 +203,6 @@
PromiseChain
);
}
-
-PromiseCoerce.table = new $WeakMap;
function PromiseCoerce(constructor, x) {
if (!IsPromise(x) && IS_SPEC_OBJECT(x)) {
@@ -212,23 +210,16 @@
try {
then = x.then;
} catch(r) {
- var promise = %_CallFunction(constructor, r, PromiseRejected);
- PromiseCoerce.table.set(x, promise);
- return promise;
+ return %_CallFunction(constructor, r, PromiseRejected);
}
- if (typeof then === 'function') {
- if (PromiseCoerce.table.has(x)) {
- return PromiseCoerce.table.get(x);
- } else {
- var deferred = %_CallFunction(constructor, PromiseDeferred);
- PromiseCoerce.table.set(x, deferred.promise);
- try {
- %_CallFunction(x, deferred.resolve, deferred.reject, then);
- } catch(r) {
- deferred.reject(r);
- }
- return deferred.promise;
+ if (IS_SPEC_FUNCTION(then)) {
+ var deferred = %_CallFunction(constructor, PromiseDeferred);
+ try {
+ %_CallFunction(x, deferred.resolve, deferred.reject, then);
+ } catch(r) {
+ deferred.reject(r);
}
+ return deferred.promise;
}
}
return x;
--
--
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.
