swift234

Fix the constraint ranking predicate to produce a correct partial ordering w.r.t to 
favored bit.  Also, ignore disjunction constraints now that we drop them on the floor
here.

Also, move the in_cast_expr_types blob down further, to make sure we emit the note for
a diagnostic after the error.

NFC on the testsuite.


Swift SVN r31312