Reviewers: Hannes Payer,
Description:
Merged r19440 into 3.24 branch.
Directly store the transition target on LookupResult in TransitionResult.
BUG=chromium:343964
LOG=N
[email protected]
Please review this at https://codereview.chromium.org/179163003/
SVN Base: https://v8.googlecode.com/svn/branches/3.24
Affected files (+39, -53 lines):
M src/hydrogen-instructions.cc
M src/hydrogen.h
M src/hydrogen.cc
M src/ic.cc
M src/objects-inl.h
M src/objects.h
M src/property.h
M src/property.cc
M src/transitions-inl.h
M src/version.cc
Index: src/hydrogen-instructions.cc
diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc
index
ed506be8c064b2462ec5a9fb80d7ba81e4c6bf2c..f8583c5b87123e2aa1b70d8573e5e3171728c817
100644
--- a/src/hydrogen-instructions.cc
+++ b/src/hydrogen-instructions.cc
@@ -4354,14 +4354,14 @@ HObjectAccess
HObjectAccess::ForBackingStoreOffset(int offset,
HObjectAccess HObjectAccess::ForField(Handle<Map> map,
LookupResult* lookup,
Handle<String> name) {
- ASSERT(lookup->IsField() || lookup->IsTransitionToField(*map));
+ ASSERT(lookup->IsField() || lookup->IsTransitionToField());
int index;
Representation representation;
if (lookup->IsField()) {
index = lookup->GetLocalFieldIndexFromMap(*map);
representation = lookup->representation();
} else {
- Map* transition = lookup->GetTransitionMapFromMap(*map);
+ Map* transition = lookup->GetTransitionTarget();
int descriptor = transition->LastAdded();
index = transition->instance_descriptors()->GetFieldIndex(descriptor) -
map->inobject_properties();
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index
46e1b18aa6afe466a94cbc6d8aca7532bfe36168..48ca18fe177e5b3672ebadfd287d8bc40ad66d7e
100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -5466,8 +5466,7 @@ bool
HOptimizedGraphBuilder::PropertyAccessInfo::CanAccessMonomorphic() {
if (lookup_.IsPropertyCallbacks()) return true;
Handle<Map> map = this->map();
map->LookupTransition(NULL, *name_, &lookup_);
- if (lookup_.IsTransitionToField(*map) && map->unused_property_fields() >
0) {
- transition_ = handle(lookup_.GetTransitionMapFromMap(*map));
+ if (lookup_.IsTransitionToField() && map->unused_property_fields() > 0) {
return true;
}
return false;
Index: src/hydrogen.h
diff --git a/src/hydrogen.h b/src/hydrogen.h
index
7eb95e2f6acdf4a40c32b3cb8c3385634345e53b..b8344ef9c41a2be58b5eb6ad2ffef37ed7d38896
100644
--- a/src/hydrogen.h
+++ b/src/hydrogen.h
@@ -2359,7 +2359,7 @@ class HOptimizedGraphBuilder : public HGraphBuilder,
public AstVisitor {
Handle<JSObject> holder() { return holder_; }
Handle<JSFunction> accessor() { return accessor_; }
Handle<Object> constant() { return constant_; }
- Handle<Object> transition() { return transition_; }
+ Handle<Map> transition() { return
handle(lookup_.GetTransitionTarget()); }
HObjectAccess access() { return access_; }
private:
@@ -2386,7 +2386,6 @@ class HOptimizedGraphBuilder : public HGraphBuilder,
public AstVisitor {
Handle<JSFunction> accessor_;
Handle<JSObject> api_holder_;
Handle<Object> constant_;
- Handle<Map> transition_;
HObjectAccess access_;
};
Index: src/ic.cc
diff --git a/src/ic.cc b/src/ic.cc
index
fb1273941822c95429714f0e2a59b06139daf644..86a77fe3077bd3bfc1ab41f74711b1d98a816714
100644
--- a/src/ic.cc
+++ b/src/ic.cc
@@ -1140,8 +1140,7 @@ static bool LookupForWrite(Handle<JSObject> receiver,
// receiver when trying to fetch extra information from the transition.
receiver->map()->LookupTransition(*holder, *name, lookup);
if (!lookup->IsTransition()) return false;
- PropertyDetails target_details =
- lookup->GetTransitionDetails(receiver->map());
+ PropertyDetails target_details = lookup->GetTransitionDetails();
if (target_details.IsReadOnly()) return false;
// If the value that's being stored does not fit in the field that the
@@ -1152,7 +1151,7 @@ static bool LookupForWrite(Handle<JSObject> receiver,
// transition target.
ASSERT(!receiver->map()->is_deprecated());
if (!value->FitsRepresentation(target_details.representation())) {
- Handle<Map> target(lookup->GetTransitionMapFromMap(receiver->map()));
+ Handle<Map> target(lookup->GetTransitionTarget());
Map::GeneralizeRepresentation(
target, target->LastAdded(),
value->OptimalRepresentation(), FORCE_FIELD);
@@ -1325,12 +1324,8 @@ Handle<Code> StoreIC::CompileHandler(LookupResult*
lookup,
case TRANSITION: {
// Explicitly pass in the receiver map since LookupForWrite may have
// stored something else than the receiver in the holder.
- Handle<Map> transition(
- lookup->GetTransitionTarget(receiver->map()), isolate());
- int descriptor = transition->LastAdded();
-
- DescriptorArray* target_descriptors =
transition->instance_descriptors();
- PropertyDetails details = target_descriptors->GetDetails(descriptor);
+ Handle<Map> transition(lookup->GetTransitionTarget());
+ PropertyDetails details = transition->GetLastDescriptorDetails();
if (details.type() == CALLBACKS || details.attributes() != NONE)
break;
Index: src/objects-inl.h
diff --git a/src/objects-inl.h b/src/objects-inl.h
index
dbac0f4685e2d0e594014e97410698499d5b84ff..65c46f0af36e11ecb1f052913dd37e62da2ed9a8
100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -2502,6 +2502,11 @@ int DescriptorArray::SearchWithCache(Name* name,
Map* map) {
}
+PropertyDetails Map::GetLastDescriptorDetails() {
+ return instance_descriptors()->GetDetails(LastAdded());
+}
+
+
void Map::LookupDescriptor(JSObject* holder,
Name* name,
LookupResult* result) {
@@ -2519,7 +2524,8 @@ void Map::LookupTransition(JSObject* holder,
TransitionArray* transition_array = transitions();
int number = transition_array->Search(name);
if (number != TransitionArray::kNotFound) {
- return result->TransitionResult(holder, number);
+ return result->TransitionResult(
+ holder, transition_array->GetTarget(number));
}
}
result->NotFound();
Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index
6e3e94132def173e13fcfbaf03b797a5796c5aa9..1b4075250718f6d59ac98077a117d7a75470c505
100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -6115,6 +6115,8 @@ class Map: public HeapObject {
Name* name,
LookupResult* result);
+ inline PropertyDetails GetLastDescriptorDetails();
+
// The size of transition arrays are limited so they do not end up in
large
// object space. Otherwise ClearNonLiveTransitions would leak memory
while
// applying in-place right trimming.
Index: src/property.cc
diff --git a/src/property.cc b/src/property.cc
index
83a6a365b874675df7e58213f6049a23e8aef9e5..2f72eec48ec6626dd06bde01efc7007920d92d9e
100644
--- a/src/property.cc
+++ b/src/property.cc
@@ -35,6 +35,7 @@ void LookupResult::Iterate(ObjectVisitor* visitor) {
LookupResult* current = this; // Could be NULL.
while (current != NULL) {
visitor->VisitPointer(BitCast<Object**>(¤t->holder_));
+ visitor->VisitPointer(BitCast<Object**>(¤t->transition_));
current = current->next_;
}
}
@@ -82,13 +83,13 @@ void LookupResult::Print(FILE* out) {
case FIELD:
PrintF(out, " -type = map transition\n");
PrintF(out, " -map:\n");
- GetTransitionMap()->Print(out);
+ GetTransitionTarget()->Print(out);
PrintF(out, "\n");
return;
case CONSTANT:
PrintF(out, " -type = constant property transition\n");
PrintF(out, " -map:\n");
- GetTransitionMap()->Print(out);
+ GetTransitionTarget()->Print(out);
PrintF(out, "\n");
return;
case CALLBACKS:
Index: src/property.h
diff --git a/src/property.h b/src/property.h
index
0f78ba478ec8512e8d94fd57a502a42a470c582a..1b30f40ffb0393de1ae0551f5fce5e62e296a8ae
100644
--- a/src/property.h
+++ b/src/property.h
@@ -184,6 +184,7 @@ class LookupResult BASE_EMBEDDED {
next_(isolate->top_lookup_result()),
lookup_type_(NOT_FOUND),
holder_(NULL),
+ transition_(NULL),
cacheable_(true),
details_(NONE, NONEXISTENT, Representation::None()) {
isolate->SetTopLookupResult(this);
@@ -199,8 +200,10 @@ class LookupResult BASE_EMBEDDED {
void DescriptorResult(JSObject* holder, PropertyDetails details, int
number) {
lookup_type_ = DESCRIPTOR_TYPE;
holder_ = holder;
+ transition_ = NULL;
details_ = details;
number_ = number;
+ transition_ = NULL;
}
bool CanHoldValue(Handle<Object> value) {
@@ -209,16 +212,18 @@ class LookupResult BASE_EMBEDDED {
return value->FitsRepresentation(details_.representation());
}
- void TransitionResult(JSObject* holder, int number) {
+ void TransitionResult(JSObject* holder, Map* target) {
lookup_type_ = TRANSITION_TYPE;
details_ = PropertyDetails(NONE, TRANSITION, Representation::None());
holder_ = holder;
- number_ = number;
+ transition_ = target;
+ number_ = 0xAAAA;
}
void DictionaryResult(JSObject* holder, int entry) {
lookup_type_ = DICTIONARY_TYPE;
holder_ = holder;
+ transition_ = NULL;
details_ = holder->property_dictionary()->DetailsAt(entry);
number_ = entry;
}
@@ -226,6 +231,7 @@ class LookupResult BASE_EMBEDDED {
void HandlerResult(JSProxy* proxy) {
lookup_type_ = HANDLER_TYPE;
holder_ = proxy;
+ transition_ = NULL;
details_ = PropertyDetails(NONE, HANDLER, Representation::Tagged());
cacheable_ = false;
}
@@ -233,6 +239,7 @@ class LookupResult BASE_EMBEDDED {
void InterceptorResult(JSObject* holder) {
lookup_type_ = INTERCEPTOR_TYPE;
holder_ = holder;
+ transition_ = NULL;
details_ = PropertyDetails(NONE, INTERCEPTOR,
Representation::Tagged());
}
@@ -248,7 +255,7 @@ class LookupResult BASE_EMBEDDED {
}
JSProxy* proxy() {
- ASSERT(IsFound());
+ ASSERT(IsHandler());
return JSProxy::cast(holder_);
}
@@ -373,42 +380,20 @@ class LookupResult BASE_EMBEDDED {
return NULL;
}
- Map* GetTransitionTarget(Map* map) {
- ASSERT(IsTransition());
- TransitionArray* transitions = map->transitions();
- return transitions->GetTarget(number_);
- }
-
Map* GetTransitionTarget() {
- return GetTransitionTarget(holder()->map());
- }
-
- PropertyDetails GetTransitionDetails(Map* map) {
- ASSERT(IsTransition());
- TransitionArray* transitions = map->transitions();
- return transitions->GetTargetDetails(number_);
+ return transition_;
}
PropertyDetails GetTransitionDetails() {
- return GetTransitionDetails(holder()->map());
- }
-
- bool IsTransitionToField(Map* map) {
- return IsTransition() && GetTransitionDetails(map).type() == FIELD;
+ return transition_->GetLastDescriptorDetails();
}
- bool IsTransitionToConstant(Map* map) {
- return IsTransition() && GetTransitionDetails(map).type() == CONSTANT;
+ bool IsTransitionToField() {
+ return IsTransition() && GetTransitionDetails().type() == FIELD;
}
- Map* GetTransitionMap() {
- ASSERT(IsTransition());
- return Map::cast(GetValue());
- }
-
- Map* GetTransitionMapFromMap(Map* map) {
- ASSERT(IsTransition());
- return map->transitions()->GetTarget(number_);
+ bool IsTransitionToConstant() {
+ return IsTransition() && GetTransitionDetails().type() == CONSTANT;
}
int GetTransitionIndex() {
@@ -501,6 +486,7 @@ class LookupResult BASE_EMBEDDED {
} lookup_type_;
JSReceiver* holder_;
+ Map* transition_;
int number_;
bool cacheable_;
PropertyDetails details_;
Index: src/transitions-inl.h
diff --git a/src/transitions-inl.h b/src/transitions-inl.h
index
7d8608b050aed7dc7dadca3751465f9a573924c6..78951171374625c7aa45fc9eaf147f50a08ea084
100644
--- a/src/transitions-inl.h
+++ b/src/transitions-inl.h
@@ -160,9 +160,7 @@ void TransitionArray::SetTarget(int transition_number,
Map* value) {
PropertyDetails TransitionArray::GetTargetDetails(int transition_number) {
Map* map = GetTarget(transition_number);
- DescriptorArray* descriptors = map->instance_descriptors();
- int descriptor = map->LastAdded();
- return descriptors->GetDetails(descriptor);
+ return map->GetLastDescriptorDetails();
}
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
b7f591e3f25f52aa5d6a9c8abd3998936cf29cd4..e60ff43f2f07e0d966f921501a00d82bd3363340
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 24
#define BUILD_NUMBER 35
-#define PATCH_LEVEL 1
+#define PATCH_LEVEL 2
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
