[libc++][C++03] cherry-pick #112102#157104

ldionne merged 1 commit intollvm:mainllvm/llvm-project:mainfrom

philnik777:cxx03_cherry_pick_prev_fixphilnik777/llvm-project:cxx03_cherry_pick_prev_fixCopy head branch name to clipboard