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

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 11541 matching lines @@
   v8::internal::Isolate::Current()->compilation_cache()->Clear();
 
   // Verify that entry hooking is now disabled.
   RunLoopInNewEnv();
   CHECK_EQ(0u, bar_count);
   CHECK_EQ(0u, foo_count);
 }
 
 
 static i::HashMap* code_map = NULL;
+static i::HashMap* jitcode_line_info = NULL;
 static int saw_bar = 0;
 static int move_events = 0;
 
 
 static bool FunctionNameIs(const char* expected,
                            const v8::JitCodeEvent* event) {
   // Log lines for functions are of the general form:
   // "LazyCompile:<type><function_name>", where the type is one of
   // "*", "~" or "".
   static const char kPreamble[] = "LazyCompile:";
@@ skipping 19 matching lines @@
   if (tail_len != expected_len)
     return false;
 
   return strncmp(tail, expected, expected_len) == 0;
 }
 
 
 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);
         CHECK_NE(0, static_cast<int>(event->code_len));
         CHECK(event->name.str != NULL);
         i::HashMap::Entry* entry =
             code_map->Lookup(event->code_start,
                              i::ComputePointerHash(event->code_start),
                              true);
@@ skipping 28 matching lines @@
           CHECK(entry != NULL);
           entry->value = reinterpret_cast<void*>(event->code_len);
         }
       }
       break;
 
     case v8::JitCodeEvent::CODE_REMOVED:
       // 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);
       break;
   }
 }
 
 
 static bool MatchPointers(void* key1, void* key2) {
   return key1 == key2;
@@ skipping 13 matching lines @@
 
   // Run this test in a new isolate to make sure we don't
   // have remnants of state from other code.
   v8::Isolate* isolate = v8::Isolate::New();
   isolate->Enter();
 
   {
     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
     // different fragmented code-space pages.
     const int kIterations = 10;
     for (int i = 0; i < kIterations; ++i) {
       LocalContext env;
 
       v8::Handle<v8::Script> compiled_script;
       {
         i::AlwaysAllocateScope always_allocate;
         SimulateFullSpace(HEAP->code_space());
         compiled_script = v8_compile(script);
       }
       compiled_script->Run();
 
       // Clear the compilation cache to get more wastage.
       ISOLATE->compilation_cache()->Clear();
     }
 
     // Force code movement.
     HEAP->CollectAllAvailableGarbage("TestSetJitCodeEventHandler");
 
     CHECK_LE(kIterations, saw_bar);
     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();
   isolate->Dispose();
 
   // Do this in a new isolate.
   isolate = v8::Isolate::New();
   isolate->Enter();
 
   // Verify that we get callbacks for existing code objects when we
   // request enumeration of existing code.
   {
     v8::HandleScope scope;
     LocalContext env;
     CompileRun(script);
 
     // Now get code through initial iteration.
     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
     // from the time of creation of an isolate, and the other by subscribing
     // with EnumExisting.
     CHECK_NE(0, code.occupancy());
   }
 
   isolate->Exit();
   isolate->Dispose();
@@ skipping 6406 matching lines @@
   i::Semaphore* sem_;
   volatile int sem_value_;
 };
 
 
 THREADED_TEST(SemaphoreInterruption) {
   ThreadInterruptTest().RunTest();
 }
 
 #endif  // WIN32