[llvm-commits] [llvm-gcc-4.2] r67941 - /llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp

[Bill Wendling]

Author: void
Date: Sat Mar 28 05:28:09 2009
New Revision: 67941

URL: http://llvm.org/viewvc/llvm-project?rev=67941&view=rev
Log:
--- Merging (from foreign repository) r67814 into '.':
U    gcc/llvm-convert.cpp

__builtin_memset_chk has an extra integer argument.

Modified:
    llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp?rev=67941&r1=67940&r2=67941&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp Sat Mar 28 05:28:09 2009
@@ -5176,9 +5176,15 @@
 
 bool TreeToLLVM::EmitBuiltinMemSet(tree exp, Value *&Result, bool SizeCheck) {
   tree arglist = TREE_OPERAND(exp, 1);
-  if (!validate_arglist(arglist, POINTER_TYPE, INTEGER_TYPE, 
-                        INTEGER_TYPE, VOID_TYPE))
-    return false;
+  if (SizeCheck) {
+    if (!validate_arglist(arglist, POINTER_TYPE, INTEGER_TYPE, 
+                          INTEGER_TYPE, INTEGER_TYPE, VOID_TYPE))
+      return false;
+  } else {
+    if (!validate_arglist(arglist, POINTER_TYPE, INTEGER_TYPE, 
+                          INTEGER_TYPE, VOID_TYPE))
+      return false;
+  }
 
   tree Dst = TREE_VALUE(arglist);
   unsigned DstAlign = getPointerAlignment(Dst);