Add parentheses around an || to correct the logic. Also silences a GCC warning

that was actually useful here.

Chris, please double check that this is the correct interpretation. I was
pretty sure, and ran it by Nick as well.

llvm-svn: 108129