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

src/assembler.h

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // 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.
 //
@@ skipping 813 matching lines @@
 };
 
 
 class PositionsRecorder BASE_EMBEDDED {
  public:
   explicit PositionsRecorder(Assembler* assembler)
       : assembler_(assembler) {
 #ifdef ENABLE_GDB_JIT_INTERFACE
     gdbjit_lineinfo_ = NULL;
 #endif
+    jit_code_event_line_info_ = NULL;
+  }
+
+~PositionsRecorder() {
+#ifdef ENABLE_GDB_JIT_INTERFACE
+    delete gdbjit_lineinfo_;
+#endif
+    delete jit_code_event_line_info_;
   }
 
 #ifdef ENABLE_GDB_JIT_INTERFACE
-  ~PositionsRecorder() {
-    delete gdbjit_lineinfo_;
-  }
-
   void StartGDBJITLineInfoRecording() {
     if (FLAG_gdbjit) {
       gdbjit_lineinfo_ = new GDBJITLineInfo();
     }
   }
 
   GDBJITLineInfo* DetachGDBJITLineInfo() {
     GDBJITLineInfo* lineinfo = gdbjit_lineinfo_;
     gdbjit_lineinfo_ = NULL;  // To prevent deallocation in destructor.
     return lineinfo;
   }
 #endif
+  JITCodeLineInfo* InitializeJITLineInfo() {

[danno, 2013/01/10 16:47:33]

Instead of these routines knowing about JITCodeLineInfo, the should just store a
"void* user_data" in the PositionsRecorder object that gets initialized by the
event handler in user_data in the CODE_START_LINE_INFO_RECORDING event and
passed by V8 back to the event handler for CODE_ADD_LINE_POS_INFO, and
CODE_END_LINE_INFO_RECORDING events. 

[chunyang.dai, 2013/01/18 10:22:44]

Done.

+    jit_code_event_line_info_ = new JITCodeLineInfo();
+    return jit_code_event_line_info_;
+  }
 
+  JITCodeLineInfo* DetachJITLineInfo() {

[danno, 2013/01/10 16:47:33]

Memory management for JITCodeLineInfo (delete) should happen here, not in the
client. See above.

[chunyang.dai, 2013/01/18 10:22:44]

Done.

+    JITCodeLineInfo* lineinfo = jit_code_event_line_info_;
+    jit_code_event_line_info_ = NULL;
+    return lineinfo;
+  }
   // Set current position to pos.
   void RecordPosition(int pos);
 
   // Set current statement position to pos.
   void RecordStatementPosition(int pos);
 
   // Write recorded positions to relocation information.
   bool WriteRecordedPositions();
 
   int current_position() const { return state_.current_position; }
 
   int current_statement_position() const {
     return state_.current_statement_position;
   }
 
+  Assembler* assembler() {
+    return assembler_;
+  }
+
  private:
   Assembler* assembler_;
   PositionState state_;
 #ifdef ENABLE_GDB_JIT_INTERFACE
   GDBJITLineInfo* gdbjit_lineinfo_;
 #endif
-
+  JITCodeLineInfo* jit_code_event_line_info_;
   friend class PreservePositionScope;
 
   DISALLOW_COPY_AND_ASSIGN(PositionsRecorder);
 };
 
 
 class PreservePositionScope BASE_EMBEDDED {
  public:
   explicit PreservePositionScope(PositionsRecorder* positions_recorder)
       : positions_recorder_(positions_recorder),
@@ skipping 72 matching lines @@
  public:
   NullCallWrapper() { }
   virtual ~NullCallWrapper() { }
   virtual void BeforeCall(int call_size) const { }
   virtual void AfterCall() const { }
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_ASSEMBLER_H_