Defer the writing of the source position data to the relocation information...

src/assembler-ia32.cc

 // 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 299 matching lines @@
   }
 
   // setup buffer pointers
   ASSERT(buffer_ != NULL);
   pc_ = buffer_;
   reloc_info_writer.Reposition(buffer_ + buffer_size, pc_);
 
   last_pc_ = NULL;
   last_bound_pos_ = 0;
   last_position_ = kNoPosition;
-  last_position_is_statement_ = false;
+  last_statement_position_ = kNoPosition;
 }
 
 
 Assembler::~Assembler() {
   if (own_buffer_) {
     if (spare_buffer_ == NULL && buffer_size_ == kMinimalBufferSize) {
       spare_buffer_ = buffer_;
     } else {
       DeleteArray(buffer_);
     }
@@ skipping 968 matching lines @@
 
 void Assembler::call(const Operand& adr) {
   EnsureSpace ensure_space(this);
   last_pc_ = pc_;
   EMIT(0xFF);
   emit_operand(edx, adr);
 }
 
 
 void Assembler::call(Handle<Code> code,  RelocMode rmode) {
+  WriteRecordedPositions();
   EnsureSpace ensure_space(this);
   last_pc_ = pc_;
   ASSERT(is_code_target(rmode));
   EMIT(0xE8);
   emit(reinterpret_cast<intptr_t>(code.location()), rmode);
 }
 
 
 void Assembler::jmp(Label* L) {
   EnsureSpace ensure_space(this);
@@ skipping 518 matching lines @@
   EMIT(0xC0 | dst.code() << 3 | src.code());
 }
 
 
 void Assembler::Print() {
   Disassembler::Decode(stdout, buffer_, pc_);
 }
 
 
 void Assembler::RecordJSReturn() {
+  WriteRecordedPositions();
   EnsureSpace ensure_space(this);
   RecordRelocInfo(js_return);
 }
 
 
 void Assembler::RecordComment(const char* msg) {
   if (FLAG_debug_code) {
     EnsureSpace ensure_space(this);
     RecordRelocInfo(comment, reinterpret_cast<intptr_t>(msg));
   }
 }
 
 
 void Assembler::RecordPosition(int pos) {
   if (pos == kNoPosition) return;
-  ASSERT(position >= 0);
-  if (pos == last_position_) return;
-  EnsureSpace ensure_space(this);
-  RecordRelocInfo(position, pos);
+  ASSERT(pos >= 0);
   last_position_ = pos;
-  last_position_is_statement_ = false;
 }
 
 
 void Assembler::RecordStatementPosition(int pos) {
   if (pos == kNoPosition) return;
-  ASSERT(position >= 0);
-  if (pos == last_position_) return;
-  EnsureSpace ensure_space(this);
-  RecordRelocInfo(statement_position, pos);
-  last_position_ = pos;
-  last_position_is_statement_ = true;
+  ASSERT(pos >= 0);
+  last_statement_position_ = pos;
+}
+
+
+void Assembler::WriteRecordedPositions() {
+  if (last_statement_position_ != kNoPosition) {
+    EnsureSpace ensure_space(this);
+    RecordRelocInfo(statement_position, last_statement_position_);
+  }
+  if ((last_position_ != kNoPosition) &&
+      (last_position_ != last_statement_position_)) {
+    EnsureSpace ensure_space(this);
+    RecordRelocInfo(position, last_position_);
+  }
+  last_statement_position_ = kNoPosition;
+  last_position_ = kNoPosition;
 }
 
 
 void Assembler::GrowBuffer() {
   ASSERT(overflow());  // should not call this otherwise
   if (!own_buffer_) FATAL("external code buffer is too small");
 
   // compute new buffer size
   CodeDesc desc;  // the new buffer
   if (buffer_size_ < 4*KB) {
@@ skipping 121 matching lines @@
       !Serializer::enabled() &&
       !FLAG_debug_code) {
     return;
   }
   RelocInfo rinfo(pc_, rmode, data);
   reloc_info_writer.Write(&rinfo);
 }
 
 
 } }  // namespace v8::internal