Oilpan: tighten DISALLOW_ALLOCATION so it does not allow inline

Source/heap/Heap.h

Index: Source/heap/Heap.h
diff --git a/Source/heap/Heap.h b/Source/heap/Heap.h
index 5904f48118862b05c1ee4c1a71afef1eb368dbe4..c6e88194dd4921f6dcf8296c98d81d43ed436d87 100644
--- a/Source/heap/Heap.h
+++ b/Source/heap/Heap.h
@@ -1025,20 +1025,36 @@ T* adoptRefCountedGarbageCollected(T* ptr)
 }
 
 #if COMPILER_SUPPORTS(CXX_DELETED_FUNCTIONS)
-#define DISALLOW_ALLOCATION() \
-    private: \
+#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; }             \
+    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);                    \
+        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; }             \
-    DISALLOW_ALLOCATION()
+    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
@@ -1047,10 +1063,11 @@ T* adoptRefCountedGarbageCollected(T* ptr)
 // 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