Fix assertion error with debug build in LLVM 3.5

This is one part of issue #607.