craig.topper added a comment. I've implemented a td based fix in r316285. Thanks for reminding me that this bug existed. It was much easier to fix after VEX_WIG was added to the td files earlier this year. https://reviews.llvm.org/D39093