summaryrefslogtreecommitdiff
path: root/deps/v8/src/property.h
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2011-10-10 17:58:30 -0700
committerRyan Dahl <ry@tinyclouds.org>2011-10-10 17:58:30 -0700
commit3b1d656da56bdd403d1625a0c6a44d75cde36cc1 (patch)
tree80de8a68eacd596f0d120efc65dbbae3f324aea0 /deps/v8/src/property.h
parent9bbca99107652906a060679ee95bf1ad7381cbb5 (diff)
downloadnode-3b1d656da56bdd403d1625a0c6a44d75cde36cc1.tar.gz
Revert "Upgrade V8 to 3.6.6"
Not stable enough. - Windows snapshot linking broken - Linux crash on ./node_g test/simple/test-stream-pipe-multi.js This reverts commit 56e6952e639ba1557a5b22333788583e9e39fa29.
Diffstat (limited to 'deps/v8/src/property.h')
-rw-r--r--deps/v8/src/property.h21
1 files changed, 9 insertions, 12 deletions
diff --git a/deps/v8/src/property.h b/deps/v8/src/property.h
index ee2e8c844..e7d9fc534 100644
--- a/deps/v8/src/property.h
+++ b/deps/v8/src/property.h
@@ -115,9 +115,11 @@ class MapTransitionDescriptor: public Descriptor {
class ElementsTransitionDescriptor: public Descriptor {
public:
ElementsTransitionDescriptor(String* key,
- Object* map_or_array)
- : Descriptor(key, map_or_array, PropertyDetails(NONE,
- ELEMENTS_TRANSITION)) { }
+ Map* map,
+ ElementsKind elements_kind)
+ : Descriptor(key, map, PropertyDetails(NONE,
+ ELEMENTS_TRANSITION,
+ elements_kind)) { }
};
// Marks a field name in a map so that adding the field is guaranteed
@@ -200,9 +202,9 @@ class LookupResult BASE_EMBEDDED {
number_ = entry;
}
- void HandlerResult(JSProxy* proxy) {
+ void HandlerResult() {
lookup_type_ = HANDLER_TYPE;
- holder_ = proxy;
+ holder_ = NULL;
details_ = PropertyDetails(NONE, HANDLER);
cacheable_ = false;
}
@@ -219,12 +221,7 @@ class LookupResult BASE_EMBEDDED {
JSObject* holder() {
ASSERT(IsFound());
- return JSObject::cast(holder_);
- }
-
- JSProxy* proxy() {
- ASSERT(IsFound());
- return JSProxy::cast(holder_);
+ return holder_;
}
PropertyType type() {
@@ -357,7 +354,7 @@ class LookupResult BASE_EMBEDDED {
CONSTANT_TYPE
} lookup_type_;
- JSReceiver* holder_;
+ JSObject* holder_;
int number_;
bool cacheable_;
PropertyDetails details_;