Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Side by Side Diff: runtime/vm/raw_object.h

Issue 50243004: Fix bug with guarded fields and deserialization. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #ifndef VM_RAW_OBJECT_H_ 5 #ifndef VM_RAW_OBJECT_H_
6 #define VM_RAW_OBJECT_H_ 6 #define VM_RAW_OBJECT_H_
7 7
8 #include "platform/assert.h" 8 #include "platform/assert.h"
9 #include "vm/globals.h" 9 #include "vm/globals.h"
10 #include "vm/token.h" 10 #include "vm/token.h"
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 kFinalized, // Class parsed, finalized and ready for use. 469 kFinalized, // Class parsed, finalized and ready for use.
470 }; 470 };
471 471
472 private: 472 private:
473 RAW_HEAP_OBJECT_IMPLEMENTATION(Class); 473 RAW_HEAP_OBJECT_IMPLEMENTATION(Class);
474 474
475 RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); } 475 RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
476 RawString* name_; 476 RawString* name_;
477 RawArray* functions_; 477 RawArray* functions_;
478 RawArray* fields_; 478 RawArray* fields_;
479 RawArray* offset_in_words_to_field_;
479 RawGrowableObjectArray* closure_functions_; // Local functions and literals. 480 RawGrowableObjectArray* closure_functions_; // Local functions and literals.
480 RawArray* interfaces_; // Array of AbstractType. 481 RawArray* interfaces_; // Array of AbstractType.
481 RawGrowableObjectArray* direct_subclasses_; // Array of Class. 482 RawGrowableObjectArray* direct_subclasses_; // Array of Class.
482 RawScript* script_; 483 RawScript* script_;
483 RawLibrary* library_; 484 RawLibrary* library_;
484 RawTypeArguments* type_parameters_; // Array of TypeParameter. 485 RawTypeArguments* type_parameters_; // Array of TypeParameter.
485 RawAbstractType* super_type_; 486 RawAbstractType* super_type_;
486 RawType* mixin_; // Generic mixin type, e.g. M<T>, not M<int>. 487 RawType* mixin_; // Generic mixin type, e.g. M<T>, not M<int>.
487 RawClass* patch_class_; 488 RawClass* patch_class_;
488 RawFunction* signature_function_; // Associated function for signature class. 489 RawFunction* signature_function_; // Associated function for signature class.
(...skipping 1224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1713 // Make sure this is updated when new TypedData types are added. 1714 // Make sure this is updated when new TypedData types are added.
1714 ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 12); 1715 ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 12);
1715 ASSERT(kExternalTypedDataInt8ArrayCid == kTypedDataInt8ArrayViewCid + 13); 1716 ASSERT(kExternalTypedDataInt8ArrayCid == kTypedDataInt8ArrayViewCid + 13);
1716 ASSERT(kNullCid == kExternalTypedDataInt8ArrayCid + 12); 1717 ASSERT(kNullCid == kExternalTypedDataInt8ArrayCid + 12);
1717 return (kNullCid - kTypedDataInt8ArrayCid); 1718 return (kNullCid - kTypedDataInt8ArrayCid);
1718 } 1719 }
1719 1720
1720 } // namespace dart 1721 } // namespace dart
1721 1722
1722 #endif // VM_RAW_OBJECT_H_ 1723 #endif // VM_RAW_OBJECT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698