Commits
Doug Gregor committed 927094991d4
Fix crasher in the protocol conformance checker. When a given associated type gets two conflicting inferences from the same signature, diagnose it without crashing. Fixes rdar://problem/21304164. Swift SVN r29412