Revert "[NFC] Cleanup RangeMap.h"

This reverts commit r259538.  Caused 92 test failures on
the OS X testbot.

llvm-svn: 259556
2 files changed