swift

c514ca23 - Revert "conformance location" back to what it was

Revert "conformance location" back to what it was We moved some diagnostics around, which ended up breaking some downstream tests that we don't want to break. Restore the location.