From fb2097510049948d9cce0219793ca61276e4f0ca Mon Sep 17 00:00:00 2001
From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Fri, 14 Aug 2015 01:57:38 -0700
Subject: [PATCH] Fix AtomicHashArray::defaultConfig SIOF.

Summary: [Folly] Fix AtomicHashArray::defaultConfig SIOF.

May fix https://github.com/facebook/folly/issues/300.

Reviewed By: @paulbiss

Differential Revision: D2343162
---
 folly/AtomicHashArray-inl.h | 19 -------------------
 folly/AtomicHashArray.h     | 16 ++++++----------
 folly/AtomicHashMap-inl.h   |  5 -----
 folly/AtomicHashMap.h       |  3 +--
 4 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/folly/AtomicHashArray-inl.h b/folly/AtomicHashArray-inl.h
index 4997545e..80272d4a 100644
--- a/folly/AtomicHashArray-inl.h
+++ b/folly/AtomicHashArray-inl.h
@@ -23,19 +23,6 @@
 
 namespace folly {
 
-template <class KeyT, class ValueT,
-          class HashFcn, class EqualFcn, class Allocator>
-const KeyT AtomicHashArray<KeyT, ValueT, HashFcn, EqualFcn, Allocator>::Config::
-kEmptyKey = (KeyT)-1;
-template <class KeyT, class ValueT,
-          class HashFcn, class EqualFcn, class Allocator>
-const KeyT AtomicHashArray<KeyT, ValueT, HashFcn, EqualFcn, Allocator>::Config::
-kLockedKey = (KeyT)-2;
-template <class KeyT, class ValueT,
-          class HashFcn, class EqualFcn, class Allocator>
-const KeyT AtomicHashArray<KeyT, ValueT, HashFcn, EqualFcn, Allocator>::Config::
-kErasedKey = (KeyT)-3;
-
 // AtomicHashArray private constructor --
 template <class KeyT, class ValueT,
           class HashFcn, class EqualFcn, class Allocator>
@@ -257,12 +244,6 @@ erase(KeyT key_in) {
   }
 }
 
-template <class KeyT, class ValueT,
-          class HashFcn, class EqualFcn, class Allocator>
-const typename AtomicHashArray<KeyT, ValueT,
-      HashFcn, EqualFcn, Allocator>::Config
-AtomicHashArray<KeyT, ValueT, HashFcn, EqualFcn, Allocator>::defaultConfig;
-
 template <class KeyT, class ValueT,
          class HashFcn, class EqualFcn, class Allocator>
 typename AtomicHashArray<KeyT, ValueT,
diff --git a/folly/AtomicHashArray.h b/folly/AtomicHashArray.h
index 3479572d..6da92b65 100644
--- a/folly/AtomicHashArray.h
+++ b/folly/AtomicHashArray.h
@@ -128,23 +128,19 @@ class AtomicHashArray : boost::noncopyable {
     int    entryCountThreadCacheSize;
     size_t capacity; // if positive, overrides maxLoadFactor
 
-  private:
-    static const KeyT kEmptyKey;
-    static const KeyT kLockedKey;
-    static const KeyT kErasedKey;
-
   public:
-    Config() : emptyKey(kEmptyKey),
-               lockedKey(kLockedKey),
-               erasedKey(kErasedKey),
+    //  Cannot have constexpr ctor because some compilers rightly complain.
+    Config() : emptyKey((KeyT)-1),
+               lockedKey((KeyT)-2),
+               erasedKey((KeyT)-3),
                maxLoadFactor(0.8),
                growthFactor(-1),
                entryCountThreadCacheSize(1000),
                capacity(0) {}
   };
 
-  static const Config defaultConfig;
-  static SmartPtr create(size_t maxSize, const Config& = defaultConfig);
+  //  Cannot have pre-instantiated const Config instance because of SIOF.
+  static SmartPtr create(size_t maxSize, const Config& c = Config());
 
   iterator find(KeyT k) {
     return iterator(this, findInternal(k).idx);
diff --git a/folly/AtomicHashMap-inl.h b/folly/AtomicHashMap-inl.h
index 4f7c6a12..92c0a150 100644
--- a/folly/AtomicHashMap-inl.h
+++ b/folly/AtomicHashMap-inl.h
@@ -22,11 +22,6 @@
 
 namespace folly {
 
-template <class KeyT, class ValueT,
-          class HashFcn, class EqualFcn, class Allocator>
-const typename AtomicHashMap<KeyT, ValueT, HashFcn, EqualFcn, Allocator>::Config
-AtomicHashMap<KeyT, ValueT, HashFcn, EqualFcn, Allocator>::defaultConfig;
-
 // AtomicHashMap constructor -- Atomic wrapper that allows growth
 // This class has a lot of overhead (184 Bytes) so only use for big maps
 template <typename KeyT, typename ValueT,
diff --git a/folly/AtomicHashMap.h b/folly/AtomicHashMap.h
index 52d2fb0d..fb353887 100644
--- a/folly/AtomicHashMap.h
+++ b/folly/AtomicHashMap.h
@@ -191,8 +191,7 @@ class AtomicHashMap : boost::noncopyable {
   // The constructor takes a finalSizeEst which is the optimal
   // number of elements to maximize space utilization and performance,
   // and a Config object to specify more advanced options.
-  static const Config defaultConfig;
-  explicit AtomicHashMap(size_t finalSizeEst, const Config& = defaultConfig);
+  explicit AtomicHashMap(size_t finalSizeEst, const Config& c = Config());
 
   ~AtomicHashMap() {
     const int numMaps = numMapsAllocated_.load(std::memory_order_relaxed);
-- 
2.34.1