Eliminate redundant load in insert constructors

diff --git a/junction/ConcurrentMap_LeapFrog.h b/junction/ConcurrentMap_LeapFrog.h
index f6b1e6c0c24fd5f7d5d6a53542f10f899c2d9411..bfbef619d2ab0c29f2a91f16239dfbce62927a75 100644 (file)
--- a/junction/ConcurrentMap_LeapFrog.h
+++ b/junction/ConcurrentMap_LeapFrog.h
@@ -74,7 +74,7 @@ public:
 
         // Constructor: Find existing cell
         Mutator(ConcurrentMap_LeapFrog& map, Key key, bool) : m_map(map), m_value(Value(ValueTraits::NullValue)) {
 
         // Constructor: Find existing cell
         Mutator(ConcurrentMap_LeapFrog& map, Key key, bool) : m_map(map), m_value(Value(ValueTraits::NullValue)) {

-            TURF_TRACE(ConcurrentMap_LeapFrog, 0, "[Mutator] find constructor called", uptr(m_table), uptr(key));
+            TURF_TRACE(ConcurrentMap_LeapFrog, 0, "[Mutator] find constructor called", uptr(0), uptr(key));

             Hash hash = KeyTraits::hash(key);
             for (;;) {
                 m_table = m_map.m_root.load(turf::Consume);
             Hash hash = KeyTraits::hash(key);
             for (;;) {
                 m_table = m_map.m_root.load(turf::Consume);


@@ -92,9 +92,8 @@ public:
         }
 
         // Constructor: Insert cell
         }
 
         // Constructor: Insert cell

-        Mutator(ConcurrentMap_LeapFrog& map, Key key)
-            : m_map(map), m_table(map.m_root.load(turf::Consume)), m_value(Value(ValueTraits::NullValue)) {
-            TURF_TRACE(ConcurrentMap_LeapFrog, 2, "[Mutator] insert constructor called", uptr(m_table), uptr(key));
+        Mutator(ConcurrentMap_LeapFrog& map, Key key) : m_map(map), m_value(Value(ValueTraits::NullValue)) {
+            TURF_TRACE(ConcurrentMap_LeapFrog, 2, "[Mutator] insert constructor called", uptr(0), uptr(key));

             Hash hash = KeyTraits::hash(key);
             for (;;) {
                 m_table = m_map.m_root.load(turf::Consume);
             Hash hash = KeyTraits::hash(key);
             for (;;) {
                 m_table = m_map.m_root.load(turf::Consume);


@@ -319,7 +318,7 @@ public:
             }
             // That's the end of the map.
             m_hash = KeyTraits::NullHash;
             }
             // That's the end of the map.
             m_hash = KeyTraits::NullHash;

-            m_value = ValueTraits::NullValue;
+            m_value = Value(ValueTraits::NullValue);

         }
 
         bool isValid() const {
         }
 
         bool isValid() const {

diff --git a/junction/ConcurrentMap_Linear.h b/junction/ConcurrentMap_Linear.h
index b93d86e342be2ac1a5ab526d7cfafe8dd683eb49..387fb6c680ad5a3301df0b1294a8c00368859185 100644 (file)
--- a/junction/ConcurrentMap_Linear.h
+++ b/junction/ConcurrentMap_Linear.h
@@ -74,7 +74,7 @@ public:
 
         // Constructor: Find existing cell
         Mutator(ConcurrentMap_Linear& map, Key key, bool) : m_map(map), m_value(Value(ValueTraits::NullValue)) {
 
         // Constructor: Find existing cell
         Mutator(ConcurrentMap_Linear& map, Key key, bool) : m_map(map), m_value(Value(ValueTraits::NullValue)) {

-            TURF_TRACE(ConcurrentMap_Linear, 0, "[Mutator] find constructor called", uptr(m_table), uptr(key));
+            TURF_TRACE(ConcurrentMap_Linear, 0, "[Mutator] find constructor called", uptr(0), uptr(key));

             Hash hash = KeyTraits::hash(key);
             for (;;) {
                 m_table = m_map.m_root.load(turf::Consume);
             Hash hash = KeyTraits::hash(key);
             for (;;) {
                 m_table = m_map.m_root.load(turf::Consume);


@@ -92,9 +92,8 @@ public:
         }
 
         // Constructor: Insert cell
         }
 
         // Constructor: Insert cell

-        Mutator(ConcurrentMap_Linear& map, Key key)
-            : m_map(map), m_table(map.m_root.load(turf::Consume)), m_value(Value(ValueTraits::NullValue)) {
-            TURF_TRACE(ConcurrentMap_Linear, 2, "[Mutator] insert constructor called", uptr(m_table), uptr(key));
+        Mutator(ConcurrentMap_Linear& map, Key key) : m_map(map), m_value(Value(ValueTraits::NullValue)) {
+            TURF_TRACE(ConcurrentMap_Linear, 2, "[Mutator] insert constructor called", uptr(0), uptr(key));

             Hash hash = KeyTraits::hash(key);
             bool mustDouble = false;
             for (;;) {
             Hash hash = KeyTraits::hash(key);
             bool mustDouble = false;
             for (;;) {


@@ -321,7 +320,7 @@ public:
             }
             // That's the end of the map.
             m_hash = KeyTraits::NullHash;
             }
             // That's the end of the map.
             m_hash = KeyTraits::NullHash;

-            m_value = ValueTraits::NullValue;
+            m_value = Value(ValueTraits::NullValue);

         }
 
         bool isValid() const {
         }
 
         bool isValid() const {