Index: test/cctest/test-api.cc |
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc |
index 5b11386d47c72f0bae3d5857b1e1996a139ace95..31ca6ff77ecc2f71acb101a0a2da9095f7b91f49 100644 |
--- a/test/cctest/test-api.cc |
+++ b/test/cctest/test-api.cc |
@@ -15225,6 +15225,46 @@ TEST(CaptureStackTraceForUncaughtExceptionAndSetters) { |
} |
+static void StackTraceDisplayNameListener( |
+ v8::Handle<v8::Message> message, |
+ v8::Handle<Value>) { |
+ v8::Handle<v8::StackTrace> stack_trace = message->GetStackTrace(); |
+ CHECK_EQ(4, stack_trace->GetFrameCount()); |
+ checkStackFrame("origin", "foo:0", 4, 7, false, false, |
+ stack_trace->GetFrame(0)); |
+ checkStackFrame("origin", "foo:1", 5, 27, false, false, |
+ stack_trace->GetFrame(1)); |
+ checkStackFrame("origin", "foo:2", 5, 27, false, false, |
+ stack_trace->GetFrame(2)); |
+ checkStackFrame("origin", "", 1, 14, false, false, |
+ stack_trace->GetFrame(3)); |
+} |
+ |
+ |
+TEST(GetStackTraceContainsFunctionsWithDisplayName) { |
+ LocalContext env; |
+ v8::HandleScope scope(env->GetIsolate()); |
+ |
+ CompileRunWithOrigin( |
+ "function gen(name, counter) {\n" |
+ " var f = function() {\n" |
+ " if (counter === 0)\n" |
+ " throw 1;\n" |
+ " gen(name, counter - 1)();\n" |
+ " };\n" |
+ " f.displayName = name + ':' + counter;\n" |
+ " return f;\n" |
+ "};", |
+ "origin"); |
+ |
+ v8::V8::AddMessageListener(StackTraceDisplayNameListener); |
+ v8::V8::SetCaptureStackTraceForUncaughtExceptions(true); |
+ CompileRunWithOrigin("gen('foo', 2)();", "origin"); |
+ v8::V8::SetCaptureStackTraceForUncaughtExceptions(false); |
+ v8::V8::RemoveMessageListeners(StackTraceDisplayNameListener); |
+} |
+ |
+ |
static void RethrowStackTraceHandler(v8::Handle<v8::Message> message, |
v8::Handle<v8::Value> data) { |
// Use the frame where JavaScript is called from. |