Simplify AssemblerPositionsRecorder.

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 1126 matching lines @@
 bool operator!=(ExternalReference, ExternalReference);
 
 size_t hash_value(ExternalReference);
 
 std::ostream& operator<<(std::ostream&, ExternalReference);
 
 
 // -----------------------------------------------------------------------------
 // Position recording support
 
 struct PositionState {

[jgruber, 2016/06/17 17:38:52]

Can this be removed?

   PositionState() : current_position(RelocInfo::kNoPosition),
                     written_position(RelocInfo::kNoPosition),
                     current_statement_position(RelocInfo::kNoPosition),
                     written_statement_position(RelocInfo::kNoPosition) {}
 
   int current_position;
   int written_position;
 
   int current_statement_position;
   int written_statement_position;
 };
 
 class AssemblerPositionsRecorder : public PositionsRecorder {
  public:
   explicit AssemblerPositionsRecorder(Assembler* assembler)
-      : assembler_(assembler) {}
+      : assembler_(assembler),
+        current_position_(RelocInfo::kNoPosition),
+        written_position_(RelocInfo::kNoPosition),
+        current_statement_position_(RelocInfo::kNoPosition),
+        written_statement_position_(RelocInfo::kNoPosition) {}
 
   // Set current position to pos.
-  void RecordPosition(int pos);
+  bool RecordPosition(int pos);
 
   // Set current statement position to pos.
-  void RecordStatementPosition(int pos);
+  bool RecordStatementPosition(int pos);
 
+ private:
   // Write recorded positions to relocation information.
   bool WriteRecordedPositions();
 
-  int current_position() const { return state_.current_position; }
+  Assembler* assembler_;
 
-  int current_statement_position() const {
-    return state_.current_statement_position;
-  }
+  int current_position_;
+  int written_position_;
 
- private:
-  Assembler* assembler_;
-  PositionState state_;
+  int current_statement_position_;
+  int written_statement_position_;
 
   DISALLOW_COPY_AND_ASSIGN(AssemblerPositionsRecorder);
 };
 
 
 // -----------------------------------------------------------------------------
 // Utility functions
 
 inline int NumberOfBitsSet(uint32_t x) {
   unsigned int num_bits_set;
@@ skipping 159 matching lines @@
     std::vector<ConstantPoolEntry> shared_entries;
   };
 
   Label emitted_label_;  // Records pc_offset of emitted pool
   PerTypeEntryInfo info_[ConstantPoolEntry::NUMBER_OF_TYPES];
 };
 
 }  // namespace internal
 }  // namespace v8
 #endif  // V8_ASSEMBLER_H_