Fix rare segfault due to invalid iterator after erase Change-Id: Id5b54d6cf10075deff0d613fec12af249c6c55a3 [ROCm/clr commit: 08d72c4f98]
08d72c4f98