Merge bleeding-edge change 985, RecordStatementPosition reform, into...

src/codegen.cc

 // Copyright 2007-2008 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 24 matching lines @@
 #include "runtime.h"
 #include "stub-cache.h"
 
 namespace v8 { namespace internal {
 
 DeferredCode::DeferredCode(CodeGenerator* generator)
   : masm_(generator->masm()),
     generator_(generator),
     enter_(generator),
     exit_(generator),
-    statement_position_(masm_->last_statement_position()),
-    position_(masm_->last_position()) {
+    statement_position_(masm_->current_statement_position()),
+    position_(masm_->current_position()) {
   generator->AddDeferred(this);
+  ASSERT(statement_position_ != RelocInfo::kNoPosition);
+  ASSERT(position_ != RelocInfo::kNoPosition);
 #ifdef DEBUG
   comment_ = "";
 #endif
 }
 
 
 void CodeGenerator::ProcessDeferred() {
   while (!deferred_.is_empty()) {
     DeferredCode* code = deferred_.RemoveLast();
     MacroAssembler* masm = code->masm();
     // Record position of deferred code stub.
-    if (code->statement_position() != RelocInfo::kNoPosition) {
-      masm->RecordStatementPosition(code->statement_position());
-    }
+    masm->RecordStatementPosition(code->statement_position());
     if (code->position() != RelocInfo::kNoPosition) {
       masm->RecordPosition(code->position());
     }
     // Bind labels and generate the code.
     code->enter()->Bind();
     frame_->SpillAll();
     Comment cmnt(masm, code->comment());
     code->Generate();
     if (code->exit()->is_bound()) {
       code->exit()->Jump();
@@ skipping 399 matching lines @@
   if (range / FastCaseSwitchMaxOverheadFactor() > length) {
     return false;  // range of labels is too sparse
   }
 
   // Optimization accepted, generate code.
   GenerateFastCaseSwitchStatement(node, min_index, range, default_index);
   return true;
 }
 
 
+void CodeGenerator::CodeForStatement(Node* node) {
+  if (FLAG_debug_info) {
+    int pos = node->statement_pos();
+    if (pos != RelocInfo::kNoPosition) {
+      masm()->RecordStatementPosition(pos);
+      CodeForSourcePosition(pos);
+    }
+  }
+}
+
+
+void CodeGenerator::CodeForSourcePosition(int pos) {
+  if (FLAG_debug_info) {
+    if (pos != RelocInfo::kNoPosition) {
+      masm()->RecordPosition(pos);
+    }
+  }
+}
+
+
 const char* RuntimeStub::GetName() {
   return Runtime::FunctionForId(id_)->stub_name;
 }
 
 
 void RuntimeStub::Generate(MacroAssembler* masm) {
   masm->TailCallRuntime(ExternalReference(id_), num_arguments_);
 }
 
 
 void ArgumentsAccessStub::Generate(MacroAssembler* masm) {
   switch (type_) {
     case READ_LENGTH: GenerateReadLength(masm); break;
     case READ_ELEMENT: GenerateReadElement(masm); break;
     case NEW_OBJECT: GenerateNewObject(masm); break;
   }
 }
 
 
 } }  // namespace v8::internal