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

Unified Diff: src/hydrogen.cc

Issue 10826139: Merged r12252 into trunk branch. (Closed) Base URL: https://v8.googlecode.com/svn/trunk
Patch Set: 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 | « no previous file | src/version.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index 7d3f1f32a3875e472d7db3d2d368613de36ef468..513e983129edd44e404471744cf0725363cafa5e 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -5422,7 +5422,9 @@ void HGraphBuilder::HandleCompoundAssignment(Assignment* expr) {
} else {
Handle<AccessorPair> accessors;
Handle<JSObject> holder;
- if (LookupAccessorPair(map, name, &accessors, &holder)) {
+ // Because we re-use the load type feedback, there might be no setter.
+ if (LookupAccessorPair(map, name, &accessors, &holder) &&
+ accessors->setter()->IsJSFunction()) {
store = BuildCallSetter(object, instr, map, accessors, holder);
} else {
CHECK_ALIVE(store = BuildStoreNamedMonomorphic(object,
@@ -7883,7 +7885,9 @@ void HGraphBuilder::VisitCountOperation(CountOperation* expr) {
} else {
Handle<AccessorPair> accessors;
Handle<JSObject> holder;
- if (LookupAccessorPair(map, name, &accessors, &holder)) {
+ // Because we re-use the load type feedback, there might be no setter.
+ if (LookupAccessorPair(map, name, &accessors, &holder) &&
+ accessors->setter()->IsJSFunction()) {
store = BuildCallSetter(object, after, map, accessors, holder);
} else {
CHECK_ALIVE(store = BuildStoreNamedMonomorphic(object,
« no previous file with comments | « no previous file | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698