Cherry-pick https://github.com/llvm/llvm-project/commit/daa350c1995015daac552548c34b87220f21156d into TF
Cherry-pick https://github.com/llvm/llvm-project/commit/daa350c1995015daac552548c34b87220f21156d into TF

This lets MSVC compile MLIR again
