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

src/assembler-arm.h

Index: src/assembler-arm.h
===================================================================
--- src/assembler-arm.h	(revision 1011)
+++ src/assembler-arm.h	(working copy)
@@ -649,16 +649,12 @@
 
   void RecordPosition(int pos);
   void RecordStatementPosition(int pos);
+  void WriteRecordedPositions();
 
   int pc_offset() const { return pc_ - buffer_; }
-  int last_position() const { return last_position_; }
-  bool last_position_is_statement() const {
-    return last_position_is_statement_;
-  }
+  int current_position() const { return current_position_; }
+  int current_statement_position() const { return current_position_; }
 
-  // Temporary helper function. Used by codegen.cc.
-  int last_statement_position() const { return last_position_; }
-
  protected:
   int buffer_space() const { return reloc_info_writer.pos() - pc_; }
 
@@ -760,8 +756,10 @@
   int last_bound_pos_;
 
   // source position information
-  int last_position_;
-  bool last_position_is_statement_;
+  int current_position_;
+  int current_statement_position_;
+  int written_position_;
+  int written_statement_position_;
 
   // Code emission
   inline void CheckBuffer();