For ScriptCollected events current context may be null. Message.GetEventContext will...

Review URL: http://codereview.chromium.org/113698

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

diff --git a/src/debug.cc b/src/debug.cc
index 2f73ef2d625057fe5d6caba5ee8ce7a038941bba..7de657910190e44cf4da1a7c0a9dda792d87d0cb 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -2400,6 +2400,11 @@ v8::Handle<v8::String> MessageImpl::GetJSON() const {
 
 v8::Handle<v8::Context> MessageImpl::GetEventContext() const {
   Handle<Context> context = Debug::debugger_entry()->GetContext();
+  // Top::context() may have been NULL when "script collected" event occured.
+  if (*context == NULL) {
+    ASSERT(event_ == v8::ScriptCollected);
+    return v8::Local<v8::Context>();
+  }
   Handle<Context> global_context(context->global_context());
   return v8::Utils::ToLocal(global_context);
 }

diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc
index edd8506c4362bdf567ba01d275f549f3bbb713d8..4afcc34e02420332b8ebe4e6a83c1385b9d8e1a8 100644 (file)
--- a/test/cctest/test-debug.cc
+++ b/test/cctest/test-debug.cc
@@ -4817,7 +4817,7 @@ TEST(ScriptCollectedEvent) {
   v8::HandleScope scope;
   DebugLocalContext env;
 
-  // Request the loaded scripte to initialize the debugger script cache.
+  // Request the loaded scripts to initialize the debugger script cache.
   Debug::GetLoadedScripts();
 
   // Do garbage collection to ensure that only the script in this test will be
@@ -4841,3 +4841,49 @@ TEST(ScriptCollectedEvent) {
   v8::Debug::SetDebugEventListener(NULL);
   CheckDebuggerUnloaded();
 }
+
+
+// Debug event listener which counts the script collected events.
+int script_collected_message_count = 0;
+static void ScriptCollectedMessageHandler(const v8::Debug::Message& message) {
+  // Count the number of scripts collected.
+  if (message.IsEvent() && message.GetEvent() == v8::ScriptCollected) {
+    script_collected_message_count++;
+    v8::Handle<v8::Context> context = message.GetEventContext();
+    CHECK(context.IsEmpty());
+  }
+}
+
+
+// Test that GetEventContext doesn't fail and return empty handle for
+// ScriptCollected events.
+TEST(ScriptCollectedEventContext) {
+  break_point_hit_count = 0;
+  v8::HandleScope scope;
+
+  { // Scope for the DebugLocalContext.
+    DebugLocalContext env;
+
+    // Request the loaded scripts to initialize the debugger script cache.
+    Debug::GetLoadedScripts();
+
+    // Do garbage collection to ensure that only the script in this test will be
+    // collected afterwards.
+    Heap::CollectAllGarbage();
+
+    script_collected_count = 0;
+    v8::Debug::SetMessageHandler2(ScriptCollectedMessageHandler);
+    {
+      v8::Script::Compile(v8::String::New("eval('a=1')"))->Run();
+      v8::Script::Compile(v8::String::New("eval('a=2')"))->Run();
+    }
+  }
+
+  // Do garbage collection to collect the script above which is no longer
+  // referenced.
+  Heap::CollectAllGarbage();
+
+  CHECK_EQ(2, script_collected_message_count);
+
+  v8::Debug::SetMessageHandler2(NULL);
+}