This patch is the propagation version of https://codereview.chromium.org/10824032 patch

test/cctest/test-api.cc

Index: test/cctest/test-api.cc
===================================================================
--- test/cctest/test-api.cc	(revision 13419)
+++ test/cctest/test-api.cc	(working copy)
@@ -11559,6 +11559,7 @@
 
 
 static i::HashMap* code_map = NULL;
+static i::HashMap* jitcode_line_info = NULL;
 static int saw_bar = 0;
 static int move_events = 0;
 
@@ -11598,7 +11599,11 @@
 static void event_handler(const v8::JitCodeEvent* event) {
   CHECK(event != NULL);
   CHECK(code_map != NULL);
+  CHECK(jitcode_line_info != NULL);
 
+  class DummyJitCodeLineInfo {
+  };
+
   switch (event->type) {
     case v8::JitCodeEvent::CODE_ADDED: {
         CHECK(event->code_start != NULL);
@@ -11646,6 +11651,43 @@
       // Object/code removal events are currently not dispatched from the GC.
       CHECK(false);
       break;
+
+    // For CODE_START_LINE_INFO_RECORDING event, we will create one
+    // DummyJitCodeLineInfo data structure pointed by event->user_dat. We
+    // record it in jitcode_line_info.
+    case v8::JitCodeEvent::CODE_START_LINE_INFO_RECORDING: {
+        DummyJitCodeLineInfo* line_info = new DummyJitCodeLineInfo();
+        v8::JitCodeEvent* temp_event = const_cast<v8::JitCodeEvent*>(event);
+        temp_event->user_data = line_info;
+        i::HashMap::Entry* entry =
+            jitcode_line_info->Lookup(line_info,
+                             i::ComputePointerHash(line_info),
+                             true);
+        entry->value = reinterpret_cast<void*>(line_info);
+      }
+      break;
+    // For these two events, we will check whether the event->user_data
+    // data structure is created before during CODE_START_LINE_INFO_RECORDING
+    // event. And delete it in CODE_END_LINE_INFO_RECORDING event handling.
+    case v8::JitCodeEvent::CODE_END_LINE_INFO_RECORDING: {
+        CHECK(event->user_data != NULL);
+        uint32_t hash = i::ComputePointerHash(event->user_data);
+        i::HashMap::Entry* entry =
+            jitcode_line_info->Lookup(event->user_data, hash, false);
+        CHECK(entry != NULL);
+        delete reinterpret_cast<DummyJitCodeLineInfo*>(event->user_data);
+      }
+      break;
+
+    case v8::JitCodeEvent::CODE_ADD_LINE_POS_INFO: {
+        CHECK(event->user_data != NULL);
+        uint32_t hash = i::ComputePointerHash(event->user_data);
+        i::HashMap::Entry* entry =
+            jitcode_line_info->Lookup(event->user_data, hash, false);
+        CHECK(entry != NULL);
+      }
+      break;
+
     default:
       // Impossible event.
       CHECK(false);
@@ -11679,11 +11721,14 @@
     i::HashMap code(MatchPointers);
     code_map = &code;
 
+    i::HashMap lineinfo(MatchPointers);
+    jitcode_line_info = &lineinfo;
+
     saw_bar = 0;
     move_events = 0;
 
     i::FLAG_stress_compaction = true;
-    V8::SetJitCodeEventHandler(v8::kJitCodeEventDefault, event_handler);
+    V8::SetJitCodeEventHandler(v8::kJitCodeEventDefault, event_handler, true);
 
     v8::HandleScope scope;
     // Generate new code objects sparsely distributed across several
@@ -11711,7 +11756,8 @@
     CHECK_NE(0, move_events);
 
     code_map = NULL;
-    V8::SetJitCodeEventHandler(v8::kJitCodeEventDefault, NULL);
+    jitcode_line_info = NULL;
+    V8::SetJitCodeEventHandler(v8::kJitCodeEventDefault, NULL, true);
   }
 
   isolate->Exit();
@@ -11732,10 +11778,16 @@
     i::HashMap code(MatchPointers);
     code_map = &code;
 
-    V8::SetJitCodeEventHandler(v8::kJitCodeEventEnumExisting, event_handler);
-    V8::SetJitCodeEventHandler(v8::kJitCodeEventDefault, NULL);
+    i::HashMap lineinfo(MatchPointers);
+    jitcode_line_info = &lineinfo;
 
+    V8::SetJitCodeEventHandler(v8::kJitCodeEventEnumExisting,
+                               event_handler,
+                               true);
+    V8::SetJitCodeEventHandler(v8::kJitCodeEventDefault, NULL, true);
+
     code_map = NULL;
+    jitcode_line_info = NULL;
 
     // We expect that we got some events. Note that if we could get code removal
     // notifications, we could compare two collections, one created by listening