* Fix assertion failure caused by command line argument getting removed after
  the map was freed.
* Cleanup code a bit


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3121 91177308-0d34-0410-b5e6-96231b3b80d8
2 files changed