<div dir="ltr">Can this be merged into 3.8?</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Feb 18, 2016 at 12:57 PM, Reid Kleckner via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rnk<br>
Date: Thu Feb 18 14:57:41 2016<br>
New Revision: 261258<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=261258&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=261258&view=rev</a><br>
Log:<br>
[IR] Straighten out bundle overload of IRBuilder::CreateCall<br>
<br>
IRBuilder has two ways of putting bundle operands on calls: the default<br>
operand bundle, and an overload of CreateCall that takes an operand<br>
bundle list.<br>
<br>
Previously, this overload used a default argument of None. This made it<br>
impossible to distinguish between the case were the caller doesn't care<br>
about bundles, and the case where the caller explicitly wants no<br>
bundles. We behaved as if they wanted the latter behavior rather than<br>
the former, which led to problems with simplifylibcalls and WinEH.<br>
<br>
This change fixes it by making the parameter non-optional, so we can<br>
distinguish these two cases.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/IR/IRBuilder.h<br>
llvm/trunk/test/Transforms/InstCombine/fprintf-1.ll<br>
<br>
Modified: llvm/trunk/include/llvm/IR/IRBuilder.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/IRBuilder.h?rev=261258&r1=261257&r2=261258&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/IRBuilder.h?rev=261258&r1=261257&r2=261258&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/IR/IRBuilder.h (original)<br>
+++ llvm/trunk/include/llvm/IR/IRBuilder.h Thu Feb 18 14:57:41 2016<br>
@@ -1547,16 +1547,7 @@ public:<br>
}<br>
<br>
CallInst *CreateCall(Value *Callee, ArrayRef<Value *> Args = None,<br>
- ArrayRef<OperandBundleDef> OpBundles = None,<br>
const Twine &Name = "", MDNode *FPMathTag = nullptr) {<br>
- CallInst *CI = CallInst::Create(Callee, Args, OpBundles);<br>
- if (isa<FPMathOperator>(CI))<br>
- CI = cast<CallInst>(AddFPMathAttributes(CI, FPMathTag, FMF));<br>
- return Insert(CI, Name);<br>
- }<br>
-<br>
- CallInst *CreateCall(Value *Callee, ArrayRef<Value *> Args,<br>
- const Twine &Name, MDNode *FPMathTag = nullptr) {<br>
PointerType *PTy = cast<PointerType>(Callee->getType());<br>
FunctionType *FTy = cast<FunctionType>(PTy->getElementType());<br>
return CreateCall(FTy, Callee, Args, Name, FPMathTag);<br>
@@ -1569,6 +1560,15 @@ public:<br>
if (isa<FPMathOperator>(CI))<br>
CI = cast<CallInst>(AddFPMathAttributes(CI, FPMathTag, FMF));<br>
return Insert(CI, Name);<br>
+ }<br>
+<br>
+ CallInst *CreateCall(Value *Callee, ArrayRef<Value *> Args,<br>
+ ArrayRef<OperandBundleDef> OpBundles,<br>
+ const Twine &Name = "", MDNode *FPMathTag = nullptr) {<br>
+ CallInst *CI = CallInst::Create(Callee, Args, OpBundles);<br>
+ if (isa<FPMathOperator>(CI))<br>
+ CI = cast<CallInst>(AddFPMathAttributes(CI, FPMathTag, FMF));<br>
+ return Insert(CI, Name);<br>
}<br>
<br>
CallInst *CreateCall(Function *Callee, ArrayRef<Value *> Args,<br>
<br>
Modified: llvm/trunk/test/Transforms/InstCombine/fprintf-1.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/fprintf-1.ll?rev=261258&r1=261257&r2=261258&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/fprintf-1.ll?rev=261258&r1=261257&r2=261258&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/InstCombine/fprintf-1.ll (original)<br>
+++ llvm/trunk/test/Transforms/InstCombine/fprintf-1.ll Thu Feb 18 14:57:41 2016<br>
@@ -61,6 +61,15 @@ define void @test_simplify4(%FILE* %fp)<br>
; CHECK-IPRINTF-NEXT: ret void<br>
}<br>
<br>
+define void @test_simplify5(%FILE* %fp) {<br>
+; CHECK-LABEL: @test_simplify5(<br>
+ %fmt = getelementptr [13 x i8], [13 x i8]* @hello_world, i32 0, i32 0<br>
+ call i32 (%FILE*, i8*, ...) @fprintf(%FILE* %fp, i8* %fmt) [ "deopt"() ]<br>
+; CHECK-NEXT: call i32 @fwrite(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @hello_world, i32 0, i32 0), i32 12, i32 1, %FILE* %fp) [ "deopt"() ]<br>
+ ret void<br>
+; CHECK-NEXT: ret void<br>
+}<br>
+<br>
define void @test_no_simplify1(%FILE* %fp) {<br>
; CHECK-IPRINTF-LABEL: @test_no_simplify1(<br>
%fmt = getelementptr [3 x i8], [3 x i8]* @percent_f, i32 0, i32 0<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>