From: rossberg@chromium.org <rossberg@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 11 Mar 2014 10:41:18 +0000 (+0000)
Subject: PromiseCoerce should ignore primitive values.
X-Git-Tag: upstream/4.7.83~10395
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b0e0442bb9bd2dc20431d5ceacc0d7ceac938e1;p=platform%2Fupstream%2Fv8.git

PromiseCoerce should ignore primitive values.

PromiseCource(x) should return "not a thenable" if Type(x) is not Object
even if x.then exists.

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

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

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

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

diff --git a/src/promise.js b/src/promise.js
index 2c36d4d..fb33beb 100644
--- a/src/promise.js
+++ b/src/promise.js
@@ -217,7 +217,7 @@ function PromiseThen(onResolve, onReject) {
 PromiseCoerce.table = new $WeakMap;
 
 function PromiseCoerce(constructor, x) {
-  if (!(IsPromise(x) || IS_NULL_OR_UNDEFINED(x))) {
+  if (!IsPromise(x) && IS_SPEC_OBJECT(x)) {
     var then = x.then;
     if (typeof then === 'function') {
       if (PromiseCoerce.table.has(x)) {