Make deserialization more regular as prep for deferring canonicalization for types/instances.

runtime/vm/raw_object.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/atomic.h"
 #include "vm/globals.h"
@@ skipping 775 matching lines @@
     kLibraryTag,
     kSourceTag,
     kPatchTag,
   };
 
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(Script);
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->url_); }
   RawString* url_;
+  RawTokenStream* tokens_;
+  RawObject** to_snapshot() {
+    return reinterpret_cast<RawObject**>(&ptr()->tokens_);
+  }
   RawString* source_;
-  RawTokenStream* tokens_;
-  RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->tokens_); }
+  RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->source_); }
 
   int32_t line_offset_;
   int32_t col_offset_;
   int8_t kind_;  // Of type Kind.
 };
 
 
 class RawLibrary : public RawObject {
   enum LibraryState {
     kAllocated,       // Initial state.
@@ skipping 1257 matching lines @@
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
   COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kNullCid == kByteBufferCid + 1);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_