Use bundle guard

Author: arsenm

llvm/lib/Target/AMDGPU/AMDGPUInstCombineIntrinsic.cpp

@@ -1134,7 +1134,15 @@ GCNTTIImpl::instCombineIntrinsic(InstCombiner &IC, IntrinsicInst &II) const {
 
       // TODO: Handle this for update_dpp, mov_ddp8, and all permlane variants.
       if (isTypeLegal(BCSrc->getType())) {
-        SmallVector<Value *, 2> Args(II.args());
+        // Make sure convergence tokens are preserved.
+        // TODO: CreateIntrinsic should allow directly copying bundles
+        SmallVector<OperandBundleDef, 2> OpBundles;
+        II.getOperandBundlesAsDefs(OpBundles);
+
+        IRBuilderBase::OperandBundlesGuard Guard(IC.Builder);
+        IC.Builder.setDefaultOperandBundles(OpBundles);
+
+        SmallVector<Value *, 3> Args(II.args());
         Args[0] = BCSrc;
         CallInst *NewCall = IC.Builder.CreateIntrinsic(
             II.getIntrinsicID(), {BCSrc->getType()}, Args);