Merge r7578 "Fix retained object info leak." to trunk

src/global-handles.h

 // Copyright 2007-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 10 matching lines @@
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef V8_GLOBAL_HANDLES_H_
 #define V8_GLOBAL_HANDLES_H_
 
+#include "../include/v8-profiler.h"
+
 #include "list-inl.h"
 
 namespace v8 {
 namespace internal {
 
 // Structure for tracking global handles.
 // A single list keeps all the allocated global handles.
 // Destroyed handles stay in the list but is added to the free list.
 // At GC the destroyed global handles are removed from the free list
 // and deallocated.
 
 // An object group is treated like a single JS object: if one of object in
 // the group is alive, all objects in the same group are considered alive.
 // An object group is used to simulate object relationship in a DOM tree.
 class ObjectGroup {
  public:
   static ObjectGroup* New(Object*** handles,
                           size_t length,
                           v8::RetainedObjectInfo* info) {
     ASSERT(length > 0);
     ObjectGroup* group = reinterpret_cast<ObjectGroup*>(
         malloc(OFFSET_OF(ObjectGroup, objects_[length])));
     group->length_ = length;
     group->info_ = info;
     CopyWords(group->objects_, handles, static_cast<int>(length));
     return group;
   }
 
   void Dispose() {
+    if (info_ != NULL) info_->Dispose();
     free(this);
   }
 
   size_t length_;
   v8::RetainedObjectInfo* info_;
   Object** objects_[1];  // Variable sized array.
 
  private:
   void* operator new(size_t size);
   void operator delete(void* p);
@@ skipping 189 matching lines @@
 
   friend class Isolate;
 
   DISALLOW_COPY_AND_ASSIGN(GlobalHandles);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_GLOBAL_HANDLES_H_