[cfe-commits] r72251 - in /cfe/trunk: lib/CodeGen/CGCall.cpp test/CodeGen/2009-05-22-callingconv.c

[Torok Edwin]

Author: edwin
Date: Fri May 22 02:25:06 2009
New Revision: 72251

URL: http://llvm.org/viewvc/llvm-project?rev=72251&view=rev
Log:
Set correct calling convention even if there is a bitcast in the way.
This attempts to fix PR4239.

Added:
    cfe/trunk/test/CodeGen/2009-05-22-callingconv.c
Modified:
    cfe/trunk/lib/CodeGen/CGCall.cpp

Modified: cfe/trunk/lib/CodeGen/CGCall.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=72251&r1=72250&r2=72251&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGCall.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCall.cpp Fri May 22 02:25:06 2009
@@ -2100,7 +2100,7 @@
   }
 
   CS.setAttributes(Attrs);
-  if (const llvm::Function *F = dyn_cast<llvm::Function>(Callee))
+  if (const llvm::Function *F =  dyn_cast<llvm::Function>(Callee->stripPointerCasts()))
     CS.setCallingConv(F->getCallingConv());
 
   // If the call doesn't return, finish the basic block and clear the

Added: cfe/trunk/test/CodeGen/2009-05-22-callingconv.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/2009-05-22-callingconv.c?rev=72251&view=auto

==============================================================================
--- cfe/trunk/test/CodeGen/2009-05-22-callingconv.c (added)
+++ cfe/trunk/test/CodeGen/2009-05-22-callingconv.c Fri May 22 02:25:06 2009
@@ -0,0 +1,25 @@
+// RUN: clang-cc %s -emit-llvm -o - | grep call | grep x86_stdcallcc
+void abort(void) __attribute__((__noreturn__));
+typedef void re_string_t;
+typedef void re_dfa_t;
+typedef int reg_errcode_t;
+static reg_errcode_t re_string_construct (re_string_t *pstr, const char *str,
+       int len, char * trans,
+       int icase, const re_dfa_t *dfa)
+     __attribute__ ((regparm (3), stdcall));
+static reg_errcode_t
+re_string_construct (pstr, str, len, trans, icase, dfa)
+     re_string_t *pstr;
+     const char *str;
+     int len, icase;
+     char * trans;
+     const re_dfa_t *dfa;
+{
+        if (dfa != (void*)0x282020c0)
+                abort();
+return 0;
+}
+int main()
+{
+  return re_string_construct(0, 0, 0, 0, 0, (void*)0x282020c0);
+}