Merge pull request #33298 from xedin/rdar-65413640

[Diagnostics] Detect and diagnose type mismatches related to function…

lib/Sema/ConstraintSystem.cpp

@@ -3852,6 +3852,11 @@ void constraints::simplifyLocator(ASTNode &anchor,
       break;
     }
 
+    case ConstraintLocator::FunctionBuilderBodyResult: {
+      path = path.slice(1);
+      break;
+    }
+
     default:
       // FIXME: Lots of other cases to handle.
       break;