swift234

Revert "Hoist more early returns as early as possible."

This reverts commit r25943.

It may have broken a test that was missing a FileCheck.

Swift SVN r25947