Revert of Release Oilpan heap singletons prior to LSan leak detection.

third_party/WebKit/Source/platform/heap/Handle.h

 /*
  * Copyright (C) 2014 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 28 matching lines @@
 #include "platform/heap/TraceTraits.h"
 #include "platform/heap/Visitor.h"
 #include "wtf/Functional.h"
 #include "wtf/HashFunctions.h"
 #include "wtf/Locker.h"
 #include "wtf/MainThread.h"
 #include "wtf/RawPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/TypeTraits.h"
 
-#if defined(LEAK_SANITIZER)
-#include "wtf/LeakAnnotations.h"
-#endif
-
 namespace blink {
 
 enum WeaknessPersistentConfiguration {
     NonWeakPersistentConfiguration,
     WeakPersistentConfiguration
 };
 
 enum CrossThreadnessPersistentConfiguration {
     SingleThreadPersistentConfiguration,
     CrossThreadPersistentConfiguration
@@ skipping 117 matching lines @@
         return *this;
     }
 
     template<typename U>
     PersistentBase& operator=(const RawPtr<U>& other)
     {
         assign(other);
         return *this;
     }
 
-#if defined(LEAK_SANITIZER)
-    PersistentBase* registerAsStaticReference()
-    {
-        if (m_persistentNode) {
-            ASSERT(ThreadState::current());
-            ThreadState::current()->registerStaticPersistentNode(m_persistentNode);
-            LEAK_SANITIZER_IGNORE_OBJECT(this);
-        }
-        return this;
-    }
-#endif
 
 private:
     NO_LAZY_SWEEP_SANITIZE_ADDRESS
     void assign(T* ptr)
     {
         m_raw = ptr;
         checkPointer();
         if (m_raw) {
             if (!m_persistentNode)
                 initialize();
@@ skipping 342 matching lines @@
         uninitialize();
     }
 
     template<typename VisitorDispatcher>
     void trace(VisitorDispatcher visitor)
     {
         static_assert(sizeof(Collection), "Collection must be fully defined");
         visitor->trace(*static_cast<Collection*>(this));
     }
 
-#if defined(LEAK_SANITIZER)
-    PersistentHeapCollectionBase* registerAsStaticReference()
-    {
-        if (m_persistentNode) {
-            ASSERT(ThreadState::current());
-            ThreadState::current()->registerStaticPersistentNode(m_persistentNode);
-            LEAK_SANITIZER_IGNORE_OBJECT(this);
-        }
-        return this;
-    }
-#endif
-
 private:
-
     NO_LAZY_SWEEP_SANITIZE_ADDRESS
     void initialize()
     {
         // FIXME: Derive affinity based on the collection.
         ThreadState* state = ThreadState::current();
         ASSERT(state->checkThread());
         m_persistentNode = state->persistentRegion()->allocatePersistentNode(this, TraceMethodDelegate<PersistentHeapCollectionBase<Collection>, &PersistentHeapCollectionBase<Collection>::trace>::trampoline);
 #if ENABLE(ASSERT)
         m_state = state;
 #endif
@@ skipping 500 matching lines @@
     static_assert(isGarbageCollected, "T needs to be a garbage collected type.");
     return ptr;
 }
 
 #define USING_FAST_MALLOC_WILL_BE_REMOVED(type) // do nothing when oilpan is enabled.
 #define USING_FAST_MALLOC_WITH_TYPE_NAME_WILL_BE_REMOVED(type)
 #define DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(type) // do nothing
 #define DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(type) // do nothing
 #define DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(type) // do nothing
 
-#if defined(LEAK_SANITIZER)
 #define DEFINE_STATIC_REF_WILL_BE_PERSISTENT(type, name, arguments) \
-    static type* name = *(new Persistent<type>(arguments))->registerAsStaticReference()
-#else
-#define DEFINE_STATIC_REF_WILL_BE_PERSISTENT(type, name, arguments) \
-    static type* name = *(new Persistent<type>(arguments))
-#endif
+    static type* name = (new Persistent<type>(arguments))->get();
 
 #else // !ENABLE(OILPAN)
 
 #define PassRefPtrWillBeRawPtr WTF::PassRefPtr
 #define RefCountedWillBeGarbageCollected WTF::RefCounted
 #define RefCountedWillBeGarbageCollectedFinalized WTF::RefCounted
 #define RefCountedWillBeRefCountedGarbageCollected WTF::RefCounted
 #define RefCountedGarbageCollectedWillBeGarbageCollectedFinalized blink::RefCountedGarbageCollected
 #define RefCountedWillBeNoBase WTF::RefCounted
 #define RefCountedGarbageCollectedWillBeNoBase blink::RefCountedGarbageCollected
@@ skipping 178 matching lines @@
 template<typename T>
 class AllowCrossThreadWeakPersistent {
     STACK_ALLOCATED();
 public:
     explicit AllowCrossThreadWeakPersistent(T* value) : m_value(value) { }
     CrossThreadWeakPersistent<T> value() const { return m_value; }
 private:
     CrossThreadWeakPersistent<T> m_value;
 };
 
-// LEAK_SANITIZER_DISABLED_SCOPE: all allocations made in the current scope
-// will be exempted from LSan consideration.
-//
-// TODO(sof): move this to wtf/LeakAnnotations.h (LeakSanitizer.h?) once
-// wtf/ can freely call upon Oilpan functionality.
-#if defined(LEAK_SANITIZER)
-class LeakSanitizerDisableScope {
-    STACK_ALLOCATED();
-    WTF_MAKE_NONCOPYABLE(LeakSanitizerDisableScope);
-public:
-    LeakSanitizerDisableScope()
-    {
-        __lsan_disable();
-        if (ThreadState::current())
-            ThreadState::current()->enterStaticReferenceRegistrationDisabledScope();
-    }
-
-    ~LeakSanitizerDisableScope()
-    {
-        __lsan_enable();
-        if (ThreadState::current())
-            ThreadState::current()->leaveStaticReferenceRegistrationDisabledScope();
-    }
-};
-#define LEAK_SANITIZER_DISABLED_SCOPE LeakSanitizerDisableScope lsanDisabledScope
-#else
-#define LEAK_SANITIZER_DISABLED_SCOPE
-#endif
-
 } // namespace blink
 
 namespace WTF {
 
 template <typename T> struct VectorTraits<blink::Member<T>> : VectorTraitsBase<blink::Member<T>> {
     static const bool needsDestruction = false;
     static const bool canInitializeWithMemset = true;
     static const bool canClearUnusedSlotsWithMemset = true;
     static const bool canMoveWithMemcpy = true;
 };
@@ skipping 228 matching lines @@
     // TODO(sof): extend WTF::FunctionWrapper call overloading to also handle (CrossThread)WeakPersistent.
     static T* unwrap(const StorageType& value) { return value.get(); }
 };
 
 template<typename T>
 PassRefPtr<T> adoptRef(blink::RefCountedGarbageCollected<T>*) = delete;
 
 } // namespace WTF
 
 #endif