[v8-dev] Reload the descriptor after modifying the transition target. (issue 23658033)

[verwaest]

Reviewers: danno,

Description:
Reload the descriptor after modifying the transition target.
R=da...@chromium.org
BUG=chromium:282736

Please review this at https://chromiumcodereview.appspot.com/23658033/

SVN Base: https://v8.googlecode.com/svn/branches/3.20

Affected files (+7, -7 lines):
  M src/objects.cc
  M src/version.cc


Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index  
995ed36f0228b9982dd08f50fc9ef0dd54406b9d..23eac77f7f5be8f3452372f72a17add0f5b19af5  
100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -3909,9 +3909,9 @@ MaybeObject*  
JSObject::SetPropertyForResult(LookupResult* lookup,
                   lookup->holder()->MigrateToMap(Map::cast(back));
               if (maybe_failure->IsFailure()) return maybe_failure;
             }
-            DescriptorArray* desc = transition_map->instance_descriptors();
-            int descriptor = transition_map->LastAdded();
-            representation = desc->GetDetails(descriptor).representation();
+            descriptors = transition_map->instance_descriptors();
+            representation =
+                descriptors->GetDetails(descriptor).representation();
           }
           int field_index = descriptors->GetFieldIndex(descriptor);
           result = lookup->holder()->AddFastPropertyUsingMap(
@@ -4117,9 +4117,9 @@ MaybeObject*  
JSObject::SetLocalPropertyIgnoreAttributes(
               MaybeObject* maybe_failure =  
self->MigrateToMap(Map::cast(back));
               if (maybe_failure->IsFailure()) return maybe_failure;
             }
-            DescriptorArray* desc = transition_map->instance_descriptors();
-            int descriptor = transition_map->LastAdded();
-            representation = desc->GetDetails(descriptor).representation();
+            descriptors = transition_map->instance_descriptors();
+            representation =
+                descriptors->GetDetails(descriptor).representation();
           }
           int field_index = descriptors->GetFieldIndex(descriptor);
           result = self->AddFastPropertyUsingMap(
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index  
cbaded333f705469cb3e5797f8a49148ff401e0b..810943444091f5df34668dc94a8ac04fe5d6c6b8  
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     20
 #define BUILD_NUMBER      17
-#define PATCH_LEVEL       6
+#define PATCH_LEVEL       7
 // 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
v8-dev@googlegroups.com
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 v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.