Revision: 23143
Author: [email protected]
Date: Mon Aug 18 08:43:11 2014 UTC
Log: Fix PromiseHasRejectHandler.
The odd-numbered items in the queue are deferred objects, not promises.
[email protected]
Review URL: https://codereview.chromium.org/473803003
http://code.google.com/p/v8/source/detail?r=23143
Added:
/branches/bleeding_edge/test/mjsunit/es6/debug-promises/throw-eventually-caught.js
Modified:
/branches/bleeding_edge/src/promise.js
/branches/bleeding_edge/test/mjsunit/es6/debug-promises/reject-caught-by-default-reject-handler.js
/branches/bleeding_edge/test/mjsunit/es6/debug-promises/throw-caught-by-default-reject-handler.js
=======================================
--- /dev/null
+++
/branches/bleeding_edge/test/mjsunit/es6/debug-promises/throw-eventually-caught.js
Mon Aug 18 08:43:11 2014 UTC
@@ -0,0 +1,42 @@
+// Copyright 2014 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --expose-debug-as debug --allow-natives-syntax
+
+// Test debug events when we only listen to uncaught exceptions and
+// there is a catch handler for the to-be-rejected Promise.
+// We expect no Exception debug events, since the default reject handler
passes
+// the rejection on to a user-defined reject handler.
+
+Debug = debug.Debug;
+
+var resolve, reject;
+var p0 = new Promise(function(res, rej) { resolve = res; reject = rej; });
+
+var p1 = p0.then(function() {
+ throw new Error();
+});
+
+var p2 = p1.then(function() { });
+var p3 = p2.catch(function() { });
+
+var q = new Promise(function(res, rej) {
+ res();
+});
+
+q.then(function() {
+ resolve();
+})
+
+
+function listener(event, exec_state, event_data, data) {
+ try {
+ assertTrue(event != Debug.DebugEvent.Exception);
+ } catch (e) {
+ %AbortJS(e + "\n" + e.stack);
+ }
+}
+
+Debug.setBreakOnUncaughtException();
+Debug.setListener(listener);
=======================================
--- /branches/bleeding_edge/src/promise.js Thu Aug 14 06:57:48 2014 UTC
+++ /branches/bleeding_edge/src/promise.js Mon Aug 18 08:43:11 2014 UTC
@@ -332,7 +332,7 @@
// the default PromiseIdRejectHandler.
for (var i = 0; i < queue.length; i += 2) {
if (queue[i] != PromiseIdRejectHandler) return true;
- if (PromiseHasRejectHandlerRecursive(queue[i + 1])) return true;
+ if (PromiseHasRejectHandlerRecursive(queue[i + 1].promise)) return
true;
}
return false;
}
=======================================
---
/branches/bleeding_edge/test/mjsunit/es6/debug-promises/reject-caught-by-default-reject-handler.js
Thu Aug 14 07:11:44 2014 UTC
+++
/branches/bleeding_edge/test/mjsunit/es6/debug-promises/reject-caught-by-default-reject-handler.js
Mon Aug 18 08:43:11 2014 UTC
@@ -5,8 +5,10 @@
// Flags: --expose-debug-as debug --allow-natives-syntax
// Test debug events when we only listen to uncaught exceptions and
-// there is a catch handler for the to-be-rejected Promise.
-// We expect an Exception debug event with a promise to be triggered.
+// there is only a default reject handler for the to-be-rejected Promise.
+// We expect two Exception debug events:
+// - when the first Promise is rejected and only has default reject
handlers.
+// - when the default reject handler passes the rejection on.
Debug = debug.Debug;
=======================================
---
/branches/bleeding_edge/test/mjsunit/es6/debug-promises/throw-caught-by-default-reject-handler.js
Thu Aug 14 07:11:44 2014 UTC
+++
/branches/bleeding_edge/test/mjsunit/es6/debug-promises/throw-caught-by-default-reject-handler.js
Mon Aug 18 08:43:11 2014 UTC
@@ -5,8 +5,10 @@
// Flags: --expose-debug-as debug --allow-natives-syntax
// Test debug events when we only listen to uncaught exceptions and
-// there is a catch handler for the to-be-rejected Promise.
-// We expect an Exception debug event with a promise to be triggered.
+// there is only a default reject handler for the to-be-rejected Promise.
+// We expect two Exception debug events:
+// - when the first Promise is rejected and only has default reject
handlers.
+// - when the default reject handler passes the rejection on.
Debug = debug.Debug;
--
--
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.
