Support LLVM trunk after r202168 r202190 revisions

This was checked for Linux and Windows.