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

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

Issue 2622273004: Fix for issue #28287 (Illegal argument in isolate message : (object is a regular Dart Instance)) (Closed)
Patch Set: Address self review comments. Created 3 years, 11 months 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
« no previous file with comments | « no previous file | runtime/vm/raw_object_snapshot.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 RUNTIME_VM_RAW_OBJECT_H_ 5 #ifndef RUNTIME_VM_RAW_OBJECT_H_
6 #define RUNTIME_VM_RAW_OBJECT_H_ 6 #define RUNTIME_VM_RAW_OBJECT_H_
7 7
8 #include "platform/assert.h" 8 #include "platform/assert.h"
9 #include "vm/atomic.h" 9 #include "vm/atomic.h"
10 #include "vm/globals.h" 10 #include "vm/globals.h"
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 int16_t num_type_arguments_; // Number of type arguments in flattened vector. 695 int16_t num_type_arguments_; // Number of type arguments in flattened vector.
696 int16_t num_own_type_arguments_; // Number of non-overlapping type arguments. 696 int16_t num_own_type_arguments_; // Number of non-overlapping type arguments.
697 uint16_t num_native_fields_; // Number of native fields in class. 697 uint16_t num_native_fields_; // Number of native fields in class.
698 uint16_t state_bits_; 698 uint16_t state_bits_;
699 699
700 friend class Instance; 700 friend class Instance;
701 friend class Isolate; 701 friend class Isolate;
702 friend class Object; 702 friend class Object;
703 friend class RawInstance; 703 friend class RawInstance;
704 friend class RawInstructions; 704 friend class RawInstructions;
705 friend class RawTypeArguments;
705 friend class SnapshotReader; 706 friend class SnapshotReader;
706 friend class InstanceSerializationCluster; 707 friend class InstanceSerializationCluster;
707 friend class CidRewriteVisitor; 708 friend class CidRewriteVisitor;
708 }; 709 };
709 710
710 711
711 class RawUnresolvedClass : public RawObject { 712 class RawUnresolvedClass : public RawObject {
712 RAW_HEAP_OBJECT_IMPLEMENTATION(UnresolvedClass); 713 RAW_HEAP_OBJECT_IMPLEMENTATION(UnresolvedClass);
713 714
714 RawObject** from() { 715 RawObject** from() {
(...skipping 979 matching lines...) Expand 10 before | Expand all | Expand 10 after
1694 RawFunction* signature_; // If not null, this type is a function type. 1695 RawFunction* signature_; // If not null, this type is a function type.
1695 RawLanguageError* error_; // If not null, type is malformed or malbounded. 1696 RawLanguageError* error_; // If not null, type is malformed or malbounded.
1696 } sig_or_err_; 1697 } sig_or_err_;
1697 RawObject** to() { 1698 RawObject** to() {
1698 return reinterpret_cast<RawObject**>(&ptr()->sig_or_err_.error_); 1699 return reinterpret_cast<RawObject**>(&ptr()->sig_or_err_.error_);
1699 } 1700 }
1700 TokenPosition token_pos_; 1701 TokenPosition token_pos_;
1701 int8_t type_state_; 1702 int8_t type_state_;
1702 1703
1703 friend class CidRewriteVisitor; 1704 friend class CidRewriteVisitor;
1705 friend class RawTypeArguments;
1704 }; 1706 };
1705 1707
1706 1708
1707 class RawTypeRef : public RawAbstractType { 1709 class RawTypeRef : public RawAbstractType {
1708 private: 1710 private:
1709 RAW_HEAP_OBJECT_IMPLEMENTATION(TypeRef); 1711 RAW_HEAP_OBJECT_IMPLEMENTATION(TypeRef);
1710 1712
1711 RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->type_); } 1713 RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->type_); }
1712 RawAbstractType* type_; // The referenced type. 1714 RawAbstractType* type_; // The referenced type.
1713 RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->type_); } 1715 RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->type_); }
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
2422 COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid == 2424 COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
2423 kTypedDataInt8ArrayViewCid + 15); 2425 kTypedDataInt8ArrayViewCid + 15);
2424 COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14); 2426 COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14);
2425 COMPILE_ASSERT(kNullCid == kByteBufferCid + 1); 2427 COMPILE_ASSERT(kNullCid == kByteBufferCid + 1);
2426 return (kNullCid - kTypedDataInt8ArrayCid); 2428 return (kNullCid - kTypedDataInt8ArrayCid);
2427 } 2429 }
2428 2430
2429 } // namespace dart 2431 } // namespace dart
2430 2432
2431 #endif // RUNTIME_VM_RAW_OBJECT_H_ 2433 #endif // RUNTIME_VM_RAW_OBJECT_H_
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/raw_object_snapshot.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698