Oilpan: Simplify Heap::allocate

Source/platform/heap/Visitor.h

 /*
  * Copyright (C) 2013 Google Inc. 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
@@ skipping 67 matching lines @@
 // Blink heap. This meta-data consists of a function pointer used to
 // trace the pointers in the object during garbage collection, an
 // indication of whether or not the object needs a finalization
 // callback, and a function pointer used to finalize the object when
 // the garbage collector determines that the object is no longer
 // reachable. There is a GCInfo struct for each class that directly
 // inherits from GarbageCollected or GarbageCollectedFinalized.
 struct GCInfo {
     bool hasFinalizer() const { return m_nonTrivialFinalizer; }
     bool hasVTable() const { return m_hasVTable; }
+    int heapIndex() const { return m_heapIndex; }
     TraceCallback m_trace;
     FinalizationCallback m_finalize;
     bool m_nonTrivialFinalizer;
     bool m_hasVTable;
+    int m_heapIndex;
 #if ENABLE(GC_PROFILING)
     // |m_className| is held as a reference to prevent dtor being called at exit.
     const String& m_className;
 #endif
 };
 
 // The FinalizerTraitImpl specifies how to finalize objects. Object
 // that inherit from GarbageCollectedFinalized are finalized by
 // calling their 'finalize' method which by default will call the
 // destructor on the object.
@@ skipping 521 matching lines @@
 
 template<typename T>
 struct GCInfoAtBase {
     static const GCInfo* get()
     {
         static const GCInfo gcInfo = {
             TraceTrait<T>::trace,
             FinalizerTrait<T>::finalize,
             FinalizerTrait<T>::nonTrivialFinalizer,
             WTF::IsPolymorphic<T>::value,
+            HeapTypeTrait<T>::index(FinalizerTrait<T>::nonTrivialFinalizer ? true : false),
 #if ENABLE(GC_PROFILING)
             TypenameStringTrait<T>::get()
 #endif
         };
         return &gcInfo;
     }
 };
 
 template<typename T> class GarbageCollected;
 template<typename T, bool = WTF::IsSubclassOfTemplate<typename WTF::RemoveConst<T>::Type, GarbageCollected>::value> struct GetGarbageCollectedBase;
@@ skipping 12 matching lines @@
 struct GCInfoTrait {
     static const GCInfo* get()
     {
         return GCInfoAtBase<typename GetGarbageCollectedBase<T>::type>::get();
     }
 };
 
 }
 
 #endif