Add addapted changes from clang/clang-omp
3f687cbc520a8b8f506d7941f0cebd6c5af1cef6.