Work around race condition in MakeArray for ASSERTs and document assumptions.

runtime/vm/raw_object.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/raw_object.h"
 
 #include "vm/class_table.h"
 #include "vm/dart.h"
 #include "vm/freelist.h"
 #include "vm/isolate.h"
@@ skipping 198 matching lines @@
       }
       default:
         UNREACHABLE();
         break;
     }
   }
   ASSERT(instance_size != 0);
 #if defined(DEBUG)
   uword tags = ptr()->tags_;
   intptr_t tags_size = SizeTag::decode(tags);
+  if ((instance_size > tags_size && tags_size > 0) && (class_id == kArrayCid)) {

[Ivan Posva, 2015/02/19 22:43:56]

"if ((class_id == kArrayCid) && ...) {"

is a bit more readable to me as it tells me that we are only interested in the
actual size relation if we are looking at an array.

[koda, 2015/02/19 22:48:49]

Agreed.

Slightly less efficient, but OK since this is DEBUG mode.

+    // TODO(22501): Array::MakeArray could be in the process of shrinking
+    // the array (see comment therein). Wait a millisecond and try again.
+    int retries_remaining = 1000;  // ... but not forever.
+    do {
+      OS::Sleep(1);
+      const RawArray* raw_array = reinterpret_cast<const RawArray*>(this);
+      intptr_t array_length = Smi::Value(raw_array->ptr()->length_);
+      instance_size = Array::InstanceSize(array_length);

[Ivan Posva, 2015/02/19 22:43:56]

Might need a comment why you are only reloading the instance_size, but not the
tag size.

[koda, 2015/02/19 22:48:49]

Done.

+    } while ((instance_size > tags_size) && (--retries_remaining > 0));
+  }
   if ((instance_size != tags_size) && (tags_size != 0)) {
     FATAL3("Size mismatch: %" Pd " from class vs %" Pd " from tags %" Px "\n",
            instance_size, tags_size, tags);
   }
 #endif  // DEBUG
   return instance_size;
 }
 
 
 #if defined(DEBUG)
@@ skipping 695 matching lines @@
 intptr_t RawUserTag::VisitUserTagPointers(
     RawUserTag* raw_obj, ObjectPointerVisitor* visitor) {
   // Make sure that we got here with the tagged pointer as this.
   ASSERT(raw_obj->IsHeapObject());
   visitor->VisitPointers(raw_obj->from(), raw_obj->to());
   return UserTag::InstanceSize();
 }
 
 
 }  // namespace dart