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

Unified Diff: runtime/vm/raw_object.h

Issue 10832199: Add a weak property type to the virtual machine. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: address final review comments Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/object_test.cc ('k') | runtime/vm/raw_object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/raw_object.h
diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h
index f74b0e5c59a0b040d54ebd288c4a14828dd9ac2e..dd0d7e08e8011a032d4cb6a2e05eecf0fa786326 100644
--- a/runtime/vm/raw_object.h
+++ b/runtime/vm/raw_object.h
@@ -89,6 +89,7 @@ namespace dart {
V(ExternalFloat64Array) \
V(Stacktrace) \
V(JSRegExp) \
+ V(WeakProperty) \
V(Closure) \
#define CLASS_LIST(V) \
@@ -190,8 +191,9 @@ class RawObject {
kMarkBit = 1,
kCanonicalBit = 2,
kFromSnapshotBit = 3,
- kReservedTagBit = 4, // kReservedBit{10K,100K,1M,10M}
- kReservedTagSize = 4,
+ kWatchedBit = 4,
+ kReservedTagBit = 5, // kReservedBit{10K,100K,1M,10M}
+ kReservedTagSize = 3,
kSizeTagBit = 8,
kSizeTagSize = 8,
kClassIdTagBit = kSizeTagBit + kSizeTagSize,
@@ -262,6 +264,21 @@ class RawObject {
ptr()->tags_ = MarkBit::update(false, tags);
}
+ // Support for GC watched bit.
+ bool IsWatched() const {
+ return WatchedBit::decode(ptr()->tags_);
+ }
+ void SetWatchedBit() {
+ ASSERT(!IsWatched());
+ uword tags = ptr()->tags_;
+ ptr()->tags_ = WatchedBit::update(true, tags);
+ }
+ void ClearWatchedBit() {
+ ASSERT(IsWatched());
+ uword tags = ptr()->tags_;
+ ptr()->tags_ = WatchedBit::update(false, tags);
+ }
+
// Support for object tags.
bool IsCanonical() const {
return CanonicalObjectTag::decode(ptr()->tags_);
@@ -331,6 +348,8 @@ class RawObject {
class MarkBit : public BitField<bool, kMarkBit, 1> {};
+ class WatchedBit : public BitField<bool, kWatchedBit, 1> {};
+
class CanonicalObjectTag : public BitField<bool, kCanonicalBit, 1> {};
class CreatedFromSnapshotTag : public BitField<bool, kFromSnapshotBit, 1> {};
@@ -355,6 +374,7 @@ class RawObject {
friend class Api;
friend class Array;
friend class FreeListElement;
+ friend class GCMarker;
friend class Heap;
friend class HeapProfiler;
friend class HeapProfilerRootVisitor;
@@ -362,6 +382,7 @@ class RawObject {
friend class Object;
friend class RawInstructions;
friend class RawInstance;
+ friend class Scavenger;
friend class SnapshotReader;
friend class SnapshotWriter;
@@ -1432,6 +1453,24 @@ class RawJSRegExp : public RawInstance {
uint8_t data_[0];
};
+class RawWeakProperty : public RawInstance {
+ RAW_HEAP_OBJECT_IMPLEMENTATION(WeakProperty);
+
+ RawObject** from() {
+ return reinterpret_cast<RawObject**>(&ptr()->key_);
+ }
+ RawObject* key_;
+ RawObject* value_;
+ RawObject** to() {
+ return reinterpret_cast<RawObject**>(&ptr()->value_);
+ }
+
+ friend class GCMarker;
+ friend class MarkingVisitor;
+ friend class Scavenger;
+ friend class ScavengerVisitor;
+};
+
// Class Id predicates.
inline bool RawObject::IsErrorClassId(intptr_t index) {
« no previous file with comments | « runtime/vm/object_test.cc ('k') | runtime/vm/raw_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698