Oilpan: tighten DISALLOW_ALLOCATION so it does not allow inline

Source/heap/Heap.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 1007 matching lines @@
 template<typename T>
 T* adoptRefCountedGarbageCollected(T* ptr)
 {
     ASSERT(ptr->hasOneRef());
     ptr->deref();
     WTF::adopted(ptr);
     return ptr;
 }
 
 #if COMPILER_SUPPORTS(CXX_DELETED_FUNCTIONS)
-#define DISALLOW_ALLOCATION() \
-    private: \
-        void* operator new(size_t) = delete;
-#else
-#define DISALLOW_ALLOCATION() \
-    private: \
-        void* operator new(size_t);
-#endif
+#define DISALLOW_ALLOCATION()                                   \
+    private:                                                    \
+        void* operator new(size_t) = delete;                    \
+        void* operator new(size_t, NotNullTag, void*) = delete; \
+        void* operator new (size_t, void*) = delete;
 
 #define ALLOW_ONLY_INLINE_ALLOCATION()                                              \
     public:                                                                         \
         void* operator new(size_t, NotNullTag, void* location) { return location; } \
         void* operator new(size_t, void* location) { return location; }             \
-    DISALLOW_ALLOCATION()
+    private:                                                                        \
+        void* operator new(size_t) = delete;
+
+#else
+
+#define DISALLOW_ALLOCATION()                          \
+    private:                                           \
+        void* operator new(size_t);                    \
+        void* operator new(size_t, NotNullTag, void*); \
+        void* operator new(size_t, void*)
+
+#define ALLOW_ONLY_INLINE_ALLOCATION()                                              \
+    public:                                                                         \
+        void* operator new(size_t, NotNullTag, void* location) { return location; } \
+        void* operator new(size_t, void* location) { return location; }             \
+    private:                                                                        \
+        void operator new(size_t);
+
+#endif
+
 
 // These macros insert annotations that the Blink GC plugin for clang uses for
 // verification. STACK_ALLOCATED is used to declare that objects of this type
 // are always stack allocated. GC_PLUGIN_IGNORE is used to make the plugin
 // ignore a particular class or field when checking for proper usage. When using
 // GC_PLUGIN_IGNORE a bug-number should be provided as an argument where the
 // bug describes what needs to happen to remove the GC_PLUGIN_IGNORE again.
 #if COMPILER(CLANG)
-#define STACK_ALLOCATED()                               \
-    private:                                            \
-        __attribute__((annotate("blink_stack_allocated")))    \
-        void* operator new(size_t) = delete;
+#define STACK_ALLOCATED()                                       \
+    private:                                                    \
+        __attribute__((annotate("blink_stack_allocated")))      \
+    DISALLOW_ALLOCATION()

[Mads Ager (chromium), 2014/03/20 07:28:05]

This doesn't work. I'll have to add them all here with annotations. :-)

[zerny-chromium, 2014/03/20 07:30:02]

I'm not sure if this will work now that there is a "private:" between the
annotation and the "operator new(size_t)" that was previously being annotated.
This also makes it unclear what method is being annotated (if any) because we
need to unfold the DISALLOW_ALLOCATION macro.

+
 #define GC_PLUGIN_IGNORE(bug)                           \
     __attribute__((annotate("blink_gc_plugin_ignore")))
 #else
 #define STACK_ALLOCATED() DISALLOW_ALLOCATION()
 #define GC_PLUGIN_IGNORE(bug)
 #endif
 
 NO_SANITIZE_ADDRESS
 void HeapObjectHeader::checkHeader() const
 {
@@ skipping 651 matching lines @@
 // to export. This forces it to export all the methods from ThreadHeap.
 template<> void ThreadHeap<FinalizedHeapObjectHeader>::addPageToHeap(const GCInfo*);
 template<> void ThreadHeap<HeapObjectHeader>::addPageToHeap(const GCInfo*);
 extern template class HEAP_EXPORT ThreadHeap<FinalizedHeapObjectHeader>;
 extern template class HEAP_EXPORT ThreadHeap<HeapObjectHeader>;
 #endif
 
 }
 
 #endif // Heap_h