Commits

Doug Gregor committed d3eabb0bd0a
[Type checker] Don't merge dictionary key type variables with different expression kinds. The constraint generator's optimization to eagerly merge type variables for different keys in a dictionary literal was too eager, merging the type variables for (e.g.) a string literal and an integer literal. This prevented us from properly inferring AnyHashable key types in dictionary literals. Fixes the rest of rdar://problem/27661580. (cherry picked from commit 4a569f3924754b6a3d2a5a1ec825931820f39023)