Revert change 23636 as it is causing issues on dartium. Will resubmit after investigating the darti…

runtime/vm/dart_api_message.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/dart_api_message.h"
 #include "vm/object.h"
 #include "vm/snapshot_ids.h"
 #include "vm/symbols.h"
 #include "vm/unicode.h"
 
@@ skipping 788 matching lines @@
   if (object->type == Dart_CObject_kArray) {
     for (int i = 0; i < object->value.as_array.length; i++) {
       Dart_CObject* element = object->value.as_array.values[i];
       UnmarkAllCObjects(element);
     }
   }
 }
 
 
 void ApiMessageWriter::AddToForwardList(Dart_CObject* object) {
-  ASSERT(forward_id_ <= forward_list_length_);
-  if (forward_id_ == forward_list_length_) {
-    intptr_t new_size;
-    intptr_t old_size;
+  if (forward_id_ >= forward_list_length_) {
+    void* new_list = NULL;
     if (forward_list_length_ == 0) {
-      old_size = 0;
       forward_list_length_ = 4;
-      new_size = forward_list_length_ * sizeof(object);
+      intptr_t new_size = forward_list_length_ * sizeof(object);
+      new_list = ::malloc(new_size);
     } else {
-      old_size = forward_list_length_ * sizeof(object);
-      new_size = old_size + old_size;
       forward_list_length_ *= 2;
+      intptr_t new_size = (forward_list_length_ * sizeof(object));
+      new_list = ::realloc(forward_list_, new_size);
     }
-    Dart_CObject** new_list = Utils::Realloc(forward_list_, old_size, new_size);
     ASSERT(new_list != NULL);
-    forward_list_ = new_list;
+    forward_list_ = reinterpret_cast<Dart_CObject**>(new_list);
   }
   forward_list_[forward_id_] = object;
   forward_id_ += 1;
 }
 
 
 void ApiMessageWriter::WriteSmi(int64_t value) {
   ASSERT(Smi::IsValid64(value));
   Write<RawObject*>(Smi::New(value));
 }
@@ skipping 282 matching lines @@
     if (!success) {
       UnmarkAllCObjects(object);
       return false;
     }
   }
   UnmarkAllCObjects(object);
   return true;
 }
 
 }  // namespace dart