support of LLVM trunk
Merge pull request #672 from ifilippov/master

Fix for LLVM trunk (3.5)