[llvm-commits] [dragonegg] r115768 - /dragonegg/trunk/llvm-convert.cpp

[Duncan Sands]

Author: baldrick
Date: Wed Oct  6 02:35:18 2010
New Revision: 115768

URL: http://llvm.org/viewvc/llvm-project?rev=115768&view=rev
Log:
Port commit 104870 (rafael) from llvm-gcc:
Set the calling convention both in the function prototype and in the call.

Modified:
    dragonegg/trunk/llvm-convert.cpp

Modified: dragonegg/trunk/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-convert.cpp?rev=115768&r1=115767&r2=115768&view=diff
==============================================================================
--- dragonegg/trunk/llvm-convert.cpp (original)
+++ dragonegg/trunk/llvm-convert.cpp Wed Oct  6 02:35:18 2010
@@ -6019,6 +6019,9 @@
   tree FunctionType = build_function_type_list(ArgType, ArgType, NULL);
   TARGET_ADJUST_LLVM_CC(CallingConvention, FunctionType);
 #endif
+
+  Function *F = cast<Function>(V);
+  F->setCallingConv(CallingConvention);
   CallInst *Call = Builder.CreateCall(V, Op);
   Call->setDoesNotThrow();
   Call->setDoesNotAccessMemory();