Am I correct in thinking we need another update to the module map? @egor.zhdan, have you thought any more about how we can fix issues like this without a compiler change, such as maybe providing the modulemap with a command line argument?
Yes, this might be a modularization issue. Are you using Ubuntu/Debian or some other distro?
One way you can do this right now is to deploy a module.modulemap file into the C++ stdlib path, that way Swift will use your own modulemap instead of the one bundled with the Swift toolchain.