Merge patch in revision 6359 to trunk.

src/preparse-data.h

 // Copyright 2010 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 21 matching lines @@
 
 namespace v8 {
 namespace internal {
 
 // Generic and general data used by preparse data recorders and readers.
 
 class PreparseDataConstants : public AllStatic {
  public:
   // Layout and constants of the preparse data exchange format.
   static const unsigned kMagicNumber = 0xBadDead;
-  static const unsigned kCurrentVersion = 5;
+  static const unsigned kCurrentVersion = 6;
 
   static const int kMagicOffset = 0;
   static const int kVersionOffset = 1;
   static const int kHasErrorOffset = 2;
   static const int kFunctionsSizeOffset = 3;
   static const int kSymbolCountOffset = 4;
   static const int kSizeOffset = 5;
   static const int kHeaderSize = 6;
 
   // If encoding a message, the following positions are fixed.
@@ skipping 187 matching lines @@
   Collector<byte> symbol_store_;
   Collector<Key> symbol_keys_;
   HashMap symbol_table_;
   int symbol_id_;
 };
 
 
 } }  // namespace v8::internal.
 
 #endif  // V8_PREPARSER_DATA_H_