Looks like this is a potential bug in my changes. I’m going to investigate.
I have a PR to fix this - https://github.com/apple/swift/pull/27384