Fix a nasty dangling pointer problem, due to a free'd pointer being left in

a map.  This caused problems if a later object happened to be allocated at
the free'd object's address.

llvm-svn: 16813