Reviewers: Sven Panne,

Message:
Fix for your chrome debug crash

Description:
Make sure to clear any previously collected field maps.

Please review this at https://codereview.chromium.org/246963003/

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

Affected files (+4, -4 lines):
  M src/hydrogen.cc


Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index f3bd68f643937a1b858c65870fdc4bac4fe1c1d3..90968373a51e16b68b1b12b4740665ff9c297e2c 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -5574,15 +5574,15 @@ bool HOptimizedGraphBuilder::PropertyAccessInfo::LoadResult(Handle<Map> map) {

 void HOptimizedGraphBuilder::PropertyAccessInfo::LoadFieldMaps(
     Handle<Map> map) {
+  // Clear any previously collected field maps.
+  field_maps_.Clear();
+
   // Figure out the field type from the accessor map.
Handle<HeapType> field_type(lookup_.GetFieldTypeFromMap(*map), isolate());

   // Collect the (stable) maps from the field type.
   int num_field_maps = field_type->NumClasses();
-  if (num_field_maps == 0) {
-    field_maps_.Clear();
-    return;
-  }
+  if (num_field_maps == 0) return;
   ASSERT(access_.representation().IsHeapObject());
   field_maps_.Reserve(num_field_maps, zone());
   HeapType::Iterator<Map> it = field_type->Classes();


--
--
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/d/optout.

Reply via email to