PromiseThen should ignore non-function parameters.

When non-function parameters are given, PromiseThen should work as if
undefined parameters were given.

BUG=347455
LOG=Y
R=rossberg@chromium.org

Review URL: https://codereview.chromium.org/180723011

Patch from Yutaka Hirano <yhirano@chromium.org>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@21025 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/promise.js b/src/promise.js
index b87f9d65f93e8420a51257b36b80355354e1a938..076b216313779660f396c57f83cee82f00f1af4f 100644 (file)
--- a/src/promise.js
+++ b/src/promise.js
@@ -215,9 +215,9 @@ function PromiseHandle(value, handler, deferred) {
 
 function PromiseThen(onResolve, onReject) {
   onResolve =
-    IS_NULL_OR_UNDEFINED(onResolve) ? PromiseIdResolveHandler : onResolve;
+    IS_SPEC_FUNCTION(onResolve) ? onResolve : PromiseIdResolveHandler;
   onReject =
-    IS_NULL_OR_UNDEFINED(onReject) ? PromiseIdRejectHandler : onReject;
+    IS_SPEC_FUNCTION(onReject) ? onReject : PromiseIdRejectHandler;
   var that = this;
   var constructor = this.constructor;
   return %_CallFunction(

diff --git a/test/mjsunit/es6/promises.js b/test/mjsunit/es6/promises.js
index ba5a306f84a23ecee98f11ddb1b1991afd394f1e..8575ba15ea885c4f7f1bb58c87409d772d6ccb98 100644 (file)
--- a/test/mjsunit/es6/promises.js
+++ b/test/mjsunit/es6/promises.js
@@ -396,6 +396,30 @@ function assertAsyncDone(iteration) {
   assertAsyncRan()
 })();
 
+(function() {
+  var deferred = Promise.defer()
+  var p1 = deferred.promise
+  var p2 = p1.then(1, 2)
+  p2.then(
+    function(x) { assertAsync(x === 5, "then/resolve-non-function") },
+    assertUnreachable
+  )
+  deferred.resolve(5)
+  assertAsyncRan()
+})();
+
+(function() {
+  var deferred = Promise.defer()
+  var p1 = deferred.promise
+  var p2 = p1.then(1, 2)
+  p2.then(
+    assertUnreachable,
+    function(x) { assertAsync(x === 5, "then/reject-non-function") }
+  )
+  deferred.reject(5)
+  assertAsyncRan()
+})();
+
 (function() {
   var deferred = Promise.defer()
   var p1 = deferred.promise

diff --git a/test/promises-aplus/promises-aplus.status b/test/promises-aplus/promises-aplus.status
index c68eae96e670ee9117e5e10c1cf136aca5b317c3..fdcf40b13fec4afbb57aa6755d098649b82f2efe 100644 (file)
--- a/test/promises-aplus/promises-aplus.status
+++ b/test/promises-aplus/promises-aplus.status
@@ -28,7 +28,5 @@
 
 [
 [ALWAYS, {
-  # http://crbug.com/347455
-  '2.2.7': FAIL
 }],  # ALWAYS
 ]