Revert of Revert of Promise assimilation fix.

test/mjsunit/es6/promises.js

 // Copyright 2013 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
@@ skipping 373 matching lines @@
   var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
   var p3 = Promise.accept(p2)
   p3.then(
     assertUnreachable,
     function(x) { assertAsync(x === 5, "rejected/thenable/then") }
   )
   assertAsyncRan()
 })();
 
 (function() {
+  var p1 = Promise.accept(5)
+  var p2 = Promise.accept(p1)
+  var called = false
+  p2.then = function(onResolve, onReject) {
+    called = true;
+    return call(Promise.prototype.then, p2, onResolve, onReject)
+  }
+  var p3 = Promise.accept(p2)
+  p3.chain(
+    function(x) {
+      assertAsync(x === p2 && !called, "resolved/thenable-promise/chain")
+    },
+    assertUnreachable)
+  assertAsyncRan()
+})();
+
+(function() {
+  var p1 = Promise.accept(5)
+  var p2 = Promise.accept(p1)
+  var called = false
+  p2.then = function(onResolve, onReject) {
+    called = true
+    return call(Promise.prototype.then, p2, onResolve, onReject)
+  }
+  var p3 = Promise.accept(p2)
+  p3.then(
+    function(x) {
+      assertAsync(x === 5 && called, "resolved/thenable-promise/then")
+    },
+    assertUnreachable)
+  assertAsyncRan()
+})();
+
+(function() {
+  var p1 = Promise.accept(5)
+  var called = false
+  var p3 = p1.then(function(x) {
+    var p2 = Promise.accept(5)
+    p2.then = function(onResolve, onReject) {
+      called = true
+      throw 25
+    }
+    return p2
+  });
+  p3.then(
+    assertUnreachable,
+    function(x) {
+      assertAsync(called && x === 25, "thenable-promise/then-call-throw")
+    })
+  assertAsyncRan()
+})();
+
+(function() {
   var deferred = Promise.defer()
   var p1 = deferred.promise
   var p2 = Promise.accept(p1)
   var p3 = Promise.accept(p2)
   p3.chain(
     function(x) { assertAsync(x === p2, "chain/resolve") },
     assertUnreachable
   )
   deferred.resolve(5)
   assertAsyncRan()
@@ skipping 106 matching lines @@
   var p1 = deferred.promise
   var p2 = {then: function(onResolve, onReject) { onResolve(p1) }}
   var p3 = Promise.accept(p2)
   p3.then(
     assertUnreachable,
     function(x) { assertAsync(x === 5, "then/reject/thenable") }
   )
   deferred.reject(5)
   assertAsyncRan()
 })();
+
+(function() {
+  var deferred = Promise.defer()
+  var deferred2 = Promise.defer()
+  var deferred3 = Promise.defer()
+
+  var p1 = deferred.promise
+  var p2 = deferred2.promise
+  var p3 = deferred3.promise
+
+  var called = false
+  p2.then = function(onResolve, onReject) {
+    called = true
+    return call(Promise.prototype.then, p2, onResolve, onReject)
+  }
+  p3.chain(
+    function(x) { assertAsync(x === p2 && !called,
+                              "chain/resolve/thenable-promise") },
+    assertUnreachable
+  )
+  deferred3.resolve(p2)
+  deferred2.resolve(p1)
+  deferred.resolve(5)
+  assertAsyncRan()
+})();
+
+(function() {
+  var deferred = Promise.defer()
+  var deferred2 = Promise.defer()
+  var deferred3 = Promise.defer()
+
+  var p1 = deferred.promise
+  var p2 = deferred2.promise
+  var p3 = deferred3.promise
+
+  var called = false
+  p2.then = function(onResolve, onReject) {
+    called = true
+    return call(Promise.prototype.then, p2, onResolve, onReject)
+  }
+  p3.then(
+    function(x) { assertAsync(x === 5 && called,
+                              "then/resolve/thenable-promise") },
+    assertUnreachable
+  )
+  deferred3.resolve(p2)
+  deferred2.resolve(p1)
+  deferred.resolve(5)
+  assertAsyncRan()
+})();
+
+(function() {
+  var deferred = Promise.defer()
+  var deferred2 = Promise.defer()
+  var deferred3 = Promise.defer()
+
+  var p1 = deferred.promise
+  var p2 = deferred2.promise
+  var p3 = deferred3.promise
+
+  var called = false
+  p2.then = function(onResolve, onReject) {
+    called = true
+    return call(Promise.prototype.then, p2, onResolve, onReject)
+  }
+  p3.chain(
+    function(x) { assertAsync(x === p2 && !called,
+                              "chain/reject/thenable-promise") },
+    assertUnreachable
+  )
+  deferred3.resolve(p2)
+  deferred2.resolve(p1)
+  deferred.reject(5)
+  assertAsyncRan()
+})();
+
+(function() {
+  var deferred = Promise.defer()
+  var deferred2 = Promise.defer()
+  var deferred3 = Promise.defer()
+
+  var p1 = deferred.promise
+  var p2 = deferred2.promise
+  var p3 = deferred3.promise
+
+  var called = false
+  p2.then = function(onResolve, onReject) {
+    called = true
+    return call(Promise.prototype.then, p2, onResolve, onReject)
+  }
+  p3.then(
+    assertUnreachable,
+    function(x) { assertAsync(x === 5 && called,
+                              "then/reject/thenable-promise") }
+  )
+  deferred3.resolve(p2)
+  deferred2.resolve(p1)
+  deferred.reject(5)
+  assertAsyncRan()
+})();
 
 (function() {
   var p1 = Promise.accept(5)
   var p2 = Promise.accept(p1)
   var deferred = Promise.defer()
   var p3 = deferred.promise
   p3.chain(
     function(x) { assertAsync(x === p2, "chain/resolve2") },
     assertUnreachable
   )
@@ skipping 498 matching lines @@
   Promise.all([11, Promise.accept(12), 13, MyPromise.accept(14), 15, 16])
   assertTrue(log === "nx14n", "subclass/all/arg")
 
   log = ""
   MyPromise.all([21, Promise.accept(22), 23, MyPromise.accept(24), 25, 26])
   assertTrue(log === "nx24nnx21nnx23nnnx25nnx26n", "subclass/all/self")
 })();
 
 
 assertAsyncDone()