[x86/SLH] Sink the return hardening into the main block-walk + hardening

code.

This consolidates all our hardening calls, and simplifies the code
a bit. It seems much more clear to handle all of these together.

No functionality changed here.

llvm-svn: 337895