This is probably OK. My only question is how long do you expect this to be dead code? That is, how long until we have a test with HSAIL showing the @ and & difference? http://reviews.llvm.org/D6467