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

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

Issue 1821793002: Revert "Remove Code::active_instructions_." (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 9 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 | « runtime/vm/object.cc ('k') | runtime/vm/raw_object.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 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/atomic.h" 9 #include "vm/atomic.h"
10 #include "vm/globals.h" 10 #include "vm/globals.h"
(...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 kInlinedCallerIdMapIndex = 2, 1073 kInlinedCallerIdMapIndex = 2,
1074 kInlinedIdToTokenPosIndex = 3, 1074 kInlinedIdToTokenPosIndex = 3,
1075 kInlinedMetadataSize = 4, 1075 kInlinedMetadataSize = 4,
1076 }; 1076 };
1077 1077
1078 RAW_HEAP_OBJECT_IMPLEMENTATION(Code); 1078 RAW_HEAP_OBJECT_IMPLEMENTATION(Code);
1079 1079
1080 uword entry_point_; 1080 uword entry_point_;
1081 1081
1082 RawObject** from() { 1082 RawObject** from() {
1083 return reinterpret_cast<RawObject**>(&ptr()->instructions_); 1083 return reinterpret_cast<RawObject**>(&ptr()->active_instructions_);
1084 } 1084 }
1085 RawInstructions* active_instructions_;
1085 RawInstructions* instructions_; 1086 RawInstructions* instructions_;
1086 RawObjectPool* object_pool_; 1087 RawObjectPool* object_pool_;
1087 // If owner_ is Function::null() the owner is a regular stub. 1088 // If owner_ is Function::null() the owner is a regular stub.
1088 // If owner_ is a Class the owner is the allocation stub for that class. 1089 // If owner_ is a Class the owner is the allocation stub for that class.
1089 // Else, owner_ is a regular Dart Function. 1090 // Else, owner_ is a regular Dart Function.
1090 RawObject* owner_; // Function, Null, or a Class. 1091 RawObject* owner_; // Function, Null, or a Class.
1091 RawExceptionHandlers* exception_handlers_; 1092 RawExceptionHandlers* exception_handlers_;
1092 RawPcDescriptors* pc_descriptors_; 1093 RawPcDescriptors* pc_descriptors_;
1093 RawCodeSourceMap* code_source_map_; 1094 RawCodeSourceMap* code_source_map_;
1094 RawArray* stackmaps_; 1095 RawArray* stackmaps_;
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after
2370 COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid == 2371 COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
2371 kTypedDataInt8ArrayViewCid + 15); 2372 kTypedDataInt8ArrayViewCid + 15);
2372 COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14); 2373 COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14);
2373 COMPILE_ASSERT(kNullCid == kByteBufferCid + 1); 2374 COMPILE_ASSERT(kNullCid == kByteBufferCid + 1);
2374 return (kNullCid - kTypedDataInt8ArrayCid); 2375 return (kNullCid - kTypedDataInt8ArrayCid);
2375 } 2376 }
2376 2377
2377 } // namespace dart 2378 } // namespace dart
2378 2379
2379 #endif // VM_RAW_OBJECT_H_ 2380 #endif // VM_RAW_OBJECT_H_
OLDNEW
« no previous file with comments | « runtime/vm/object.cc ('k') | runtime/vm/raw_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698