Fix for PRPR17934; based on a fix suggested by Peter Sommerlad

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@196058 91177308-0d34-0410-b5e6-96231b3b80d8