Porting to the changes for latest LLVM 3.6