Refactor ScriptData class for cached compile data.

src/serialize.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_SERIALIZE_H_
 #define V8_SERIALIZE_H_
 
+#include "src/compiler.h"
 #include "src/hashmap.h"
 #include "src/heap-profiler.h"
 #include "src/isolate.h"
-#include "src/parser.h"
 #include "src/snapshot-source-sink.h"
 
 namespace v8 {
 namespace internal {
 
 // A TypeCode is used to distinguish different kinds of external reference.
 // It is a single bit to make testing for types easy.
 enum TypeCode {
   UNCLASSIFIED,        // One-of-a-kind references.
   BUILTIN,
@@ skipping 441 matching lines @@
   Isolate* isolate_;
   // Keep track of the fullness of each space in order to generate
   // relative addresses for back references.
   int fullness_[LAST_SPACE + 1];
   SnapshotByteSink* sink_;
   ExternalReferenceEncoder* external_reference_encoder_;
 
   SerializationAddressMapper address_mapper_;
   intptr_t root_index_wave_front_;
   void Pad();
-  void PadByte();
 
   friend class ObjectSerializer;
   friend class Deserializer;
 
   // We may not need the code address map for logging for every instance
   // of the serializer.  Initialize it on demand.
   void InitializeCodeAddressMap();
 
  private:
   CodeAddressMap* code_address_map_;
@@ skipping 85 matching lines @@
 
   // The data header consists of int-sized entries:
   // [0] version hash
   // [1] length in bytes
   // [2..8] reservation sizes for spaces from NEW_SPACE to PROPERTY_CELL_SPACE.
   static const int kHeaderSize = 9;
   static const int kVersionHashOffset = 0;
   static const int kPayloadLengthOffset = 1;
   static const int kReservationsOffset = 2;
 };
+
+
+// Wrapper around ScriptData to provide code-serializer-specific functionality.
+class SerializedCodeData {
+ public:
+  // Used by when consuming.
+  explicit SerializedCodeData(ScriptData* data) : script_data_(data) {
+    CHECK(Sanity());
+    owns_script_data_ = false;

[vogelheim, 2014/07/09 17:23:37]

nitpick: maybe set owns_script_data_ in initializer list?

[Yang, 2014/07/10 08:28:46]

Done.

+  }
+
+  // Used when producing.
+  SerializedCodeData(List<byte>* payload, CodeSerializer* cs);
+
+  ~SerializedCodeData() {
+    if (owns_script_data_) delete script_data_;
+  }
+
+  // Return ScriptData object and relinquish ownership over it to the caller.
+  ScriptData* GetScriptData() {

[vogelheim, 2014/07/09 17:23:37]

What if owns_script_data_ is already false when this is called? Maybe add a
CHECK.

[Yang, 2014/07/10 08:28:46]

I think ASSERT should be sufficient. Add that.

+    ScriptData* result = script_data_;
+    script_data_ = NULL;
+    owns_script_data_ = false;
+    return result;
+  }
+
+  const byte* Payload() const {
+    return script_data_->data() + kHeaderEntries * kIntSize;
+  }
+
+  int PayloadLength() const {
+    return script_data_->length() - kHeaderEntries * kIntSize;
+  }
+
+  int GetReservation(int space) const {
+    return GetHeaderValue(kReservationsOffset + space);
+  }
+
+ private:
+  void SetHeaderValue(int offset, int value) {
+    reinterpret_cast<int*>(const_cast<byte*>(script_data_->data()))[offset] =
+        value;
+  }
+
+  int GetHeaderValue(int offset) const {
+    return reinterpret_cast<const int*>(script_data_->data())[offset];
+  }
+
+  bool Sanity();
+
+  // The data header consists of int-sized entries:
+  // [0] version hash
+  // [1..7] reservation sizes for spaces from NEW_SPACE to PROPERTY_CELL_SPACE.
+  static const int kVersionHashOffset = 0;
+  static const int kReservationsOffset = 1;
+  static const int kHeaderEntries = 8;
+
+  ScriptData* script_data_;
+  bool owns_script_data_;
+};
 } }  // namespace v8::internal
 
 #endif  // V8_SERIALIZE_H_