Support LLVM trunk after 203559 203213 and 203381 revisions