Address review feedbacks of AddDiscriminator change

llvm-svn: 272850
2 files changed