[oilpan] Remove GC_INFO_{DEFINE,DECLARE} macros

Source/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 135 matching lines @@
 struct FinalizerTraitImpl<T, false> {
     static void finalize(void* obj) { };
 };
 
 // Default trait uses the automatic detection.
 template<typename T> struct FinalizerTrait {
     static const bool nonTrivialFinalizer = HasFinalizer<T>::value;
     static void finalize(void* obj) { FinalizerTraitImpl<T, nonTrivialFinalizer>::finalize(obj); }
 };
 
-#define DECLARE_GC_INFO                                                       \
-public:                                                                       \
-    static const GCInfo s_gcInfo;                                             \
-    template<typename Any> friend struct FinalizerTrait;                      \
-private:                                                                      \
+#define DECLARE_GC_INFO
+#define DEFINE_GC_INFO(Type)
 
-#define DEFINE_GC_INFO(Type)                                                  \
-const GCInfo Type::s_gcInfo = {                                               \
-    #Type,                                                                    \
-    TraceTrait<Type>::trace,                                                  \
-    FinalizerTrait<Type>::finalize,                                           \
-    FinalizerTrait<Type>::nonTrivialFinalizer,                                \
-    CLASSOF_FUNC(Type)                                                        \
-};                                                                            \
-
-template<typename T>
-struct GCInfoTrait {
-    static const GCInfo* get()
-    {
-        return &T::s_gcInfo;
-    }
-};
+template<typename T> struct GCInfoTrait;
 
 template<typename T>
 const char* getTypeMarker()
 {
     return GCInfoTrait<T>::get()->m_typeMarker;
 }
 
 // Most classes that have instances on the heap have an trace method, which is
 // used to trace the pointers to other heap objects inside an object.
 template<typename T>
@@ skipping 359 matching lines @@
 }
 
 class HeapVisitable {
 public:
     virtual void trace(Visitor*) = 0;
     virtual ~HeapVisitable()
     {
     }
 };
 
+template<typename T>
+struct GCInfoAtBase {
+    static const GCInfo* get()
+    {
+        static char pseudoTypeMarker = 'a'; // FIXME: This is to be removed
+        static const GCInfo gcInfo = {
+            &pseudoTypeMarker,
+            TraceTrait<T>::trace,
+            FinalizerTrait<T>::finalize,
+            FinalizerTrait<T>::nonTrivialFinalizer,
+            CLASSOF_FUNC(T)
+        };
+        return &gcInfo;
+    }
+};
+
+template<typename T>
+struct GCInfoTrait {
+    static const GCInfo* get()
+    {
+        return GCInfoAtBase<typename T::GarbageCollectedBase>::get();
+    }
+};
+
 }
+
 #endif