swift234

rework how diagnoseConstraintFailure sorts through constraints that it 
is considering, making it a bit stronger at handling disjunction constraints
as well as fixing it to stop sending non-conversion constraints down into
diagnoseGeneralConversionFailure.



Swift SVN r31294