keep tracking LLVM trunk

Got it work with LLVM r204771.
Thanks for Markus Trippelsdorf providing us the patch!