commit b8dced5dfa3b5abba27898dfd0a8341995756584
author Sanjoy Das <sanjoy@playingwithpointers.com> Wed Dec 09 01:01:28 2015 +0000
committer Sanjoy Das <sanjoy@playingwithpointers.com> Wed Dec 09 01:01:28 2015 +0000
tree ae4868ba75b17320911ca9b9b97406a3a64a4513
parent 7471abd9ed0f224c6301ffa68cf02e21f900ef19

Don't drop attributes when inlining through "deopt" operand bundles

Test case attached (test case also checks that we don't drop the calling
convention, but that functionality was correct before this patch).

llvm-svn: 255088

llvm/lib/IR/Instructions.cpp

diff --git a/llvm/lib/IR/Instructions.cpp b/llvm/lib/IR/Instructions.cpp
index bba0ef2..6ec2e28 100644
--- a/llvm/lib/IR/Instructions.cpp
+++ b/llvm/lib/IR/Instructions.cpp
@@ -307,6 +307,7 @@
   NewCI->setTailCallKind(CI->getTailCallKind());
   NewCI->setCallingConv(CI->getCallingConv());
   NewCI->SubclassOptionalData = CI->SubclassOptionalData;
+  NewCI->setAttributes(CI->getAttributes());
   return NewCI;
 }
 
@@ -594,6 +595,7 @@
                                    II->getName(), InsertPt);
   NewII->setCallingConv(II->getCallingConv());
   NewII->SubclassOptionalData = II->SubclassOptionalData;
+  NewII->setAttributes(II->getAttributes());
   return NewII;
 }