Fix PR5558, which was caused by a wrong fix for PR3393 (see commit 63048),

which was an expensive checks failure due to a bug in the checking.  This
patch in essence reverts the original fix for PR3393, and refixes it by a
tweak to the way expensive checking is done.

llvm-svn: 89454