Merge pull request #3911 from tautschnig/irept-opt-number

Construct element in place

Author: tautschnig

src/util/irep_hash_container.cpp

@@ -27,9 +27,10 @@ size_t irep_hash_container_baset::number(const irept &irep)
   pack(irep, packed);
   size_t id=numbering.number(packed);
 
-  auto &irep_entry = ptr_hash[&irep.read()];
-  irep_entry.number = id;
-  irep_entry.irep = irep;
+  ptr_hash.emplace(
+    std::piecewise_construct,
+    std::forward_as_tuple(&irep.read()),
+    std::forward_as_tuple(id, irep));
 
   return id;
 }

src/util/irep_hash_container.h

@@ -49,6 +49,11 @@ class irep_hash_container_baset
   {
     std::size_t number;
     irept irep; // copy to keep addresses stable
+
+    irep_entryt(std::size_t _number, const irept &_irep)
+      : number(_number), irep(_irep)
+    {
+    }
   };
 
   typedef std::unordered_map<const void *, irep_entryt, pointer_hasht>