[llvm-commits] [llvm] r98270 - in /llvm/trunk: lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/tailcallfp2.ll
Evan Cheng
evan.cheng at apple.com
Thu Mar 11 11:44:06 PST 2010
Sorry, I think this is just my head malfunctioning. I'll back it out.
Evan
On Mar 11, 2010, at 11:12 AM, Evan Cheng wrote:
> I should note this is only an issue when MachineModuleInfo callsEHReturn() returns true.
>
> Evan
>
> On Mar 11, 2010, at 10:49 AM, Evan Cheng wrote:
>
>> Author: evancheng
>> Date: Thu Mar 11 12:49:14 2010
>> New Revision: 98270
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=98270&view=rev
>> Log:
>> Bad bad bug. x86 force indirect tail call address into eax when it's meant to force it into a call preserved register instead. Change it to ecx for now.
>>
>> Modified:
>> llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
>> llvm/trunk/test/CodeGen/X86/tailcallfp2.ll
>>
>> Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=98270&r1=98269&r2=98270&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
>> +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Thu Mar 11 12:49:14 2010
>> @@ -2091,7 +2091,7 @@
>> // tailcall must happen after callee-saved registers are poped.
>> // FIXME: Give it a special register class that contains caller-saved
>> // register instead?
>> - unsigned TCReg = Is64Bit ? X86::R11 : X86::EAX;
>> + unsigned TCReg = Is64Bit ? X86::R11 : X86::ECX;
>> Chain = DAG.getCopyToReg(Chain, dl,
>> DAG.getRegister(TCReg, getPointerTy()),
>> Callee,InFlag);
>> @@ -2145,7 +2145,7 @@
>> }
>>
>> assert(((Callee.getOpcode() == ISD::Register &&
>> - (cast<RegisterSDNode>(Callee)->getReg() == X86::EAX ||
>> + (cast<RegisterSDNode>(Callee)->getReg() == X86::ECX ||
>> cast<RegisterSDNode>(Callee)->getReg() == X86::R11)) ||
>> Callee.getOpcode() == ISD::TargetExternalSymbol ||
>> Callee.getOpcode() == ISD::TargetGlobalAddress) &&
>>
>> Modified: llvm/trunk/test/CodeGen/X86/tailcallfp2.ll
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/tailcallfp2.ll?rev=98270&r1=98269&r2=98270&view=diff
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/X86/tailcallfp2.ll (original)
>> +++ llvm/trunk/test/CodeGen/X86/tailcallfp2.ll Thu Mar 11 12:49:14 2010
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=x86 -tailcallopt | grep {jmp} | grep {\\*%eax}
>> +; RUN: llc < %s -march=x86 -tailcallopt | grep {jmp} | grep {\\*%ecx}
>>
>> declare i32 @putchar(i32)
>>
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
More information about the llvm-commits
mailing list