Commits

Chris Willmore committed 9910c75c67a
Don't offer incorrect fixit for NSString? -> String? conversion. Update the locator when matching optional types in parallel fashion. This causes the simplifyLocator() call to fail to simplify the locator completely, and avoids the bogus diagnostic. <rdar://problem/19836341> Incorrect fixit for NSString? to String? conversions Swift SVN r25596