Add stack trace to the promise reject callback.

test/cctest/test-api.cc

 // Copyright 2012 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 17613 matching lines @@
   v8::V8::SetCaptureStackTraceForUncaughtExceptions(true);
   CompileRun(source);
   v8::V8::SetCaptureStackTraceForUncaughtExceptions(false);
   v8::V8::RemoveMessageListeners(RethrowBogusErrorStackTraceHandler);
 }
 
 
 v8::PromiseRejectEvent reject_event = v8::kPromiseRejectWithNoHandler;
 int promise_reject_counter = 0;
 int promise_revoke_counter = 0;
+int promise_reject_line_number = -1;
+int promise_reject_frame_count = -1;
 
 void PromiseRejectCallback(v8::Handle<v8::Promise> promise,
+                           v8::PromiseRejectEvent event,
                            v8::Handle<v8::Value> value,
-                           v8::PromiseRejectEvent event) {
+                           v8::Handle<v8::StackTrace> stack_trace) {
   if (event == v8::kPromiseRejectWithNoHandler) {
     promise_reject_counter++;
     CcTest::global()->Set(v8_str("rejected"), promise);
     CcTest::global()->Set(v8_str("value"), value);
+    if (!stack_trace.IsEmpty()) {
+      promise_reject_frame_count = stack_trace->GetFrameCount();
+      if (promise_reject_frame_count > 0) {
+        CHECK(stack_trace->GetFrame(0)->GetScriptName()->Equals(v8_str("pro")));
+        promise_reject_line_number = stack_trace->GetFrame(0)->GetLineNumber();
+      } else {
+        promise_reject_line_number = -1;
+      }
+    }
   } else {
     promise_revoke_counter++;
     CcTest::global()->Set(v8_str("revoked"), promise);
     CHECK(value.IsEmpty());
+    CHECK(stack_trace.IsEmpty());
   }
 }
 
 
 v8::Handle<v8::Promise> GetPromise(const char* name) {
   return v8::Handle<v8::Promise>::Cast(CcTest::global()->Get(v8_str(name)));
 }
 
 
 v8::Handle<v8::Value> RejectValue() {
   return CcTest::global()->Get(v8_str("value"));
 }
 
 
 void ResetPromiseStates() {
   promise_reject_counter = 0;
   promise_revoke_counter = 0;
+  promise_reject_line_number = -1;
+  promise_reject_frame_count = -1;
   CcTest::global()->Set(v8_str("rejected"), v8_str(""));
   CcTest::global()->Set(v8_str("value"), v8_str(""));
   CcTest::global()->Set(v8_str("revoked"), v8_str(""));
 }
 
 
 TEST(PromiseRejectCallback) {
   LocalContext env;
   v8::Isolate* isolate = env->GetIsolate();
   v8::HandleScope scope(isolate);
 
   isolate->SetPromiseRejectCallback(PromiseRejectCallback);
 
   ResetPromiseStates();
 
   // Create promise p0.
   CompileRun(
       "var reject;            \n"
-      "var p0 = new Promise(   \n"
+      "var p0 = new Promise(  \n"
       "  function(res, rej) { \n"
       "    reject = rej;      \n"
       "  }                    \n"
       ");                     \n");
   CHECK(!GetPromise("p0")->HasHandler());
   CHECK_EQ(0, promise_reject_counter);
   CHECK_EQ(0, promise_revoke_counter);
 
   // Add resolve handler (and default reject handler) to p0.
   CompileRun("var p1 = p0.then(function(){});");
@@ skipping 27 matching lines @@
   CHECK_EQ(2, promise_reject_counter);
   CHECK_EQ(1, promise_revoke_counter);
   CHECK(GetPromise("rejected")->Equals(GetPromise("p2")));
   CHECK(RejectValue()->Equals(v8_str("ppp")));
   CHECK(GetPromise("revoked")->Equals(GetPromise("p1")));
 
   ResetPromiseStates();
 
   // Create promise q0.
   CompileRun(
-      "var q0 = new Promise(   \n"
+      "var q0 = new Promise(  \n"
       "  function(res, rej) { \n"
       "    reject = rej;      \n"
       "  }                    \n"
       ");                     \n");
   CHECK(!GetPromise("q0")->HasHandler());
   CHECK_EQ(0, promise_reject_counter);
   CHECK_EQ(0, promise_revoke_counter);
 
   // Add reject handler to q0.
   CompileRun("var q1 = q0.catch(function() {});");
@@ skipping 25 matching lines @@
   CHECK(!GetPromise("q2")->HasHandler());
   CHECK(GetPromise("q_")->HasHandler());
   CHECK_EQ(2, promise_reject_counter);
   CHECK_EQ(1, promise_revoke_counter);
   CHECK(GetPromise("rejected")->Equals(GetPromise("q2")));
   CHECK(GetPromise("revoked")->Equals(GetPromise("q_")));
   CHECK(RejectValue()->Equals(v8_str("qqq")));
 
   // Add a reject handler to the resolved q1, which rejects by throwing.
   CompileRun(
-      "var q3 = q1.then( \n"
+      "var q3 = q1.then(  \n"
       "   function() {    \n"
       "     throw 'qqqq'; \n"
       "   }               \n"
       ");                 \n");
   CHECK(GetPromise("q0")->HasHandler());
   CHECK(GetPromise("q1")->HasHandler());
   CHECK(!GetPromise("q2")->HasHandler());
   CHECK(!GetPromise("q3")->HasHandler());
   CHECK_EQ(3, promise_reject_counter);
   CHECK_EQ(1, promise_revoke_counter);
@@ skipping 75 matching lines @@
 
   // Reject s0.
   CompileRun("reject('sss')");
   CHECK(GetPromise("s0")->HasHandler());
   CHECK(!GetPromise("s1")->HasHandler());
   CHECK(!GetPromise("s2")->HasHandler());
   CHECK(!GetPromise("s3")->HasHandler());
   CHECK_EQ(3, promise_reject_counter);
   CHECK_EQ(0, promise_revoke_counter);
   CHECK(RejectValue()->Equals(v8_str("sss")));
+
+  // Test stack frames.
+  V8::SetCaptureStackTraceForUncaughtExceptions(true);
+
+  ResetPromiseStates();
+
+  // Create promise t0, which is rejected in the constructor with an error.
+  CompileRunWithOrigin(
+      "var t0 = new Promise(  \n"
+      "  function(res, rej) { \n"
+      "    reference_error;   \n"
+      "  }                    \n"
+      ");                     \n",
+      "pro", 0, 0);
+  CHECK(!GetPromise("t0")->HasHandler());
+  CHECK_EQ(1, promise_reject_counter);
+  CHECK_EQ(0, promise_revoke_counter);
+  CHECK_EQ(2, promise_reject_frame_count);
+  CHECK_EQ(3, promise_reject_line_number);
+
+  ResetPromiseStates();
+
+  // Create promise u0 and chain u1 to it, which is rejected via throw.
+  CompileRunWithOrigin(
+      "var u0 = Promise.resolve();        \n"
+      "var u1 = u0.then(                  \n"
+      "           function() {            \n"
+      "             (function() {         \n"
+      "                throw new Error(); \n"
+      "              })();                \n"
+      "           }                       \n"
+      "         );                        \n",
+      "pro", 0, 0);
+  CHECK(GetPromise("u0")->HasHandler());
+  CHECK(!GetPromise("u1")->HasHandler());
+  CHECK_EQ(1, promise_reject_counter);
+  CHECK_EQ(0, promise_revoke_counter);
+  CHECK_EQ(2, promise_reject_frame_count);
+  CHECK_EQ(5, promise_reject_line_number);
+
+  // Throw in u3, which handles u1's rejection.
+  CompileRunWithOrigin(
+      "function f() {                \n"
+      "  return (function() {        \n"
+      "    return new Error();       \n"
+      "  })();                       \n"
+      "}                             \n"
+      "var u2 = Promise.reject(f()); \n"
+      "var u3 = u1.catch(            \n"
+      "           function() {       \n"
+      "             return u2;       \n"
+      "           }                  \n"
+      "         );                   \n",
+      "pro", 0, 0);
+  CHECK(GetPromise("u0")->HasHandler());
+  CHECK(GetPromise("u1")->HasHandler());
+  CHECK(GetPromise("u2")->HasHandler());
+  CHECK(!GetPromise("u3")->HasHandler());
+  CHECK_EQ(3, promise_reject_counter);
+  CHECK_EQ(2, promise_revoke_counter);
+  CHECK_EQ(3, promise_reject_frame_count);
+  CHECK_EQ(3, promise_reject_line_number);
+
+  ResetPromiseStates();
+
+  // Create promise rejected promise v0, which is incorrectly handled by v1
+  // via chaining cycle.
+  CompileRunWithOrigin(
+      "var v0 = Promise.reject(); \n"
+      "var v1 = v0.catch(         \n"
+      "           function() {    \n"
+      "             return v1;    \n"
+      "           }               \n"
+      "         );                \n",
+      "pro", 0, 0);
+  CHECK(GetPromise("v0")->HasHandler());
+  CHECK(!GetPromise("v1")->HasHandler());
+  CHECK_EQ(2, promise_reject_counter);
+  CHECK_EQ(1, promise_revoke_counter);
+  CHECK_EQ(0, promise_reject_frame_count);

[aandrey, 2014/10/07 10:49:05]

CHECK_EQ(-1, promise_reject_line_number);

 }
 
 
 void AnalyzeStackOfEvalWithSourceURL(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   v8::HandleScope scope(args.GetIsolate());
   v8::Handle<v8::StackTrace> stackTrace = v8::StackTrace::CurrentStackTrace(
       args.GetIsolate(), 10, v8::StackTrace::kDetailed);
   CHECK_EQ(5, stackTrace->GetFrameCount());
   v8::Handle<v8::String> url = v8_str("eval_url");
@@ skipping 5819 matching lines @@
       "  var foobXXXXX";  // Too many bytes which look like incomplete chars!
   char chunk2[] =
       "r = 13;\n"
       "  return foob\xeb\x91\x80\x80\x80r;\n"
       "}\n";
   for (int i = 0; i < 5; ++i) chunk1[strlen(chunk1) - 5 + i] = reference[i];
 
   const char* chunks[] = {chunk1, chunk2, "foo();", NULL};
   RunStreamingTest(chunks, v8::ScriptCompiler::StreamedSource::UTF8, false);
 }