[llvm-commits] CVS: llvm/lib/Target/X86/X86ISelLowering.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/X86:

X86ISelLowering.cpp updated: 1.206 -> 1.207
---
Log message:

CSRet allows varargs


---
Diffs of the changes:  (+3 -2)

 X86ISelLowering.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/X86/X86ISelLowering.cpp
diff -u llvm/lib/Target/X86/X86ISelLowering.cpp:1.206 llvm/lib/Target/X86/X86ISelLowering.cpp:1.207
--- llvm/lib/Target/X86/X86ISelLowering.cpp:1.206	Wed May 17 14:07:40 2006
+++ llvm/lib/Target/X86/X86ISelLowering.cpp	Fri May 19 16:34:04 2006
@@ -380,8 +380,9 @@
                                bool isTailCall,
                                SDOperand Callee, ArgListTy &Args,
                                SelectionDAG &DAG) {
-  assert((!isVarArg || CallingConv == CallingConv::C) &&
-         "Only C takes varargs!");
+  assert((!isVarArg || CallingConv == CallingConv::C || 
+          CallingConv == CallingConv::CSRet) &&
+         "Only CCC/CSRet takes varargs!");
 
   // If the callee is a GlobalAddress node (quite common, every direct call is)
   // turn it into a TargetGlobalAddress node so that legalize doesn't hack it.