Remove trailing spaces. Fix an assert to use && instead of || before string....

Remove trailing spaces. Fix an assert to use && instead of || before string. Add same assert on similar code path.

llvm-svn: 147335