EricWF accepted this revision. EricWF added a comment. This revision is now accepted and ready to land. I'm going to go ahead and commit this now. We can address concerns about the future C++20 spec in follow up commits. https://reviews.llvm.org/D49774