Mostly revert "Small performance optimizations."

This reverts commit 1bf5d1c.

Author: greg7mdp

include/gtl/phmap.hpp

@@ -2489,20 +2489,18 @@ class raw_hash_set {
 
     template<class K = key_type>
     bool find_impl(const key_arg<K>& GTL_RESTRICT key, size_t hashval, size_t& GTL_RESTRICT offset) {
-        auto ctrl_ptr = ctrl_;
         if constexpr (!std_alloc_t::value) {
             // ctrl_ could be nullptr
-            if (!ctrl_ptr)
+            if (!ctrl_)
                 return false;
         }
         auto seq = probe(hashval);
-        auto slots_ptr = slots_;
         while (true) {
-            Group g{ ctrl_ptr + seq.offset() };
+            Group g{ ctrl_ + seq.offset() };
             for (uint32_t i : g.Match((h2_t)H2(hashval))) {
                 offset = seq.offset((size_t)i);
                 if (GTL_PREDICT_TRUE(
-                        PolicyTraits::apply(EqualElement<K>{ key, eq_ref() }, PolicyTraits::element(slots_ptr + offset))))
+                        PolicyTraits::apply(EqualElement<K>{ key, eq_ref() }, PolicyTraits::element(slots_ + offset))))
                     return true;
             }
             if (GTL_PREDICT_TRUE(g.MatchEmpty()))
@@ -2652,11 +2650,9 @@ class raw_hash_set {
         if constexpr (!std::is_trivially_destructible<typename PolicyTraits::value_type>::value ||
                       std::is_same<typename Policy::is_flat, std::false_type>::value) {
             // node map or not trivially destructible... we  need to iterate and destroy values one by one
-            auto slots_ptr = slots_; // local variable not aliased
-            auto ctrl_ptr  = ctrl_;
             for (size_t i = 0, cnt = capacity_; i != cnt; ++i) {
-                if (IsFull(ctrl_ptr[i])) {
-                    PolicyTraits::destroy(&alloc_ref(), slots_ptr + i);
+                if (IsFull(ctrl_[i])) {
+                    PolicyTraits::destroy(&alloc_ref(), slots_ + i);
                 }
             }
         }
@@ -2840,19 +2836,17 @@ class raw_hash_set {
 protected:
     template<class K>
     size_t _find_key(const K& GTL_RESTRICT key, size_t hashval) {
-        auto ctrl_ptr = ctrl_;
         if constexpr (!std_alloc_t::value) {
             // ctrl_ could be nullptr
-            if (!ctrl_ptr)
+            if (!ctrl_)
                 return  (size_t)-1;
         }
         auto seq = probe(hashval);
-        auto slots_ptr = slots_;
         while (true) {
-            Group g{ ctrl_ptr + seq.offset() };
+            Group g{ ctrl_ + seq.offset() };
             for (uint32_t i : g.Match((h2_t)H2(hashval))) {
                 if (GTL_PREDICT_TRUE(PolicyTraits::apply(EqualElement<K>{ key, eq_ref() },
-                                                         PolicyTraits::element(slots_ptr + seq.offset((size_t)i)))))
+                                                         PolicyTraits::element(slots_ + seq.offset((size_t)i)))))
                     return seq.offset((size_t)i);
             }
             if (GTL_PREDICT_TRUE(g.MatchEmpty()))