Symbol-table writer: fix use of map key after erasure

smowton · smowton · commit 506a29185ac5 · 2017-10-25T09:50:39.000+01:00
This was revealed by re-enabling the OSX build, which evidently is quicker
to re-use the memory formerly occupied by the pair&lt;key, value&gt;!
diff --git a/src/util/symbol_table_writer.h b/src/util/symbol_table_writer.h
@@ -124,8 +124,9 @@ class journalling_symbol_table_writert
 
   void erase(const symbol_tablet::symbolst::const_iterator &entry)
   {
+    const irep_idt entry_name=entry->first;
     base_symbol_table.erase(entry);
-    on_remove(entry->first);
+    on_remove(entry_name);
   }
 
   void clear()

Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,9 @@ class journalling_symbol_table_writert`
`124`	`124`
`125`	`125`	`void erase(const symbol_tablet::symbolst::const_iterator &entry)`
`126`	`126`	`{`
	`127`	`+ const irep_idt entry_name=entry->first;`
`127`	`128`	`base_symbol_table.erase(entry);`
`128`		`- on_remove(entry->first);`
	`129`	`+ on_remove(entry_name);`
`129`	`130`	`}`
`130`	`131`
`131`	`132`	`void clear()`