[cfe-commits] r129892 - in /cfe/trunk: lib/CodeGen/CGBuiltin.cpp test/CodeGen/builtin-memfns.c

[Chris Lattner]

Author: lattner
Date: Wed Apr 20 18:14:50 2011
New Revision: 129892

URL: http://llvm.org/viewvc/llvm-project?rev=129892&view=rev
Log:
fix a crash on code that uses the result value of __builtin___memcpy_chk.

Modified:
    cfe/trunk/lib/CodeGen/CGBuiltin.cpp
    cfe/trunk/test/CodeGen/builtin-memfns.c

Modified: cfe/trunk/lib/CodeGen/CGBuiltin.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBuiltin.cpp?rev=129892&r1=129891&r2=129892&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGBuiltin.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGBuiltin.cpp Wed Apr 20 18:14:50 2011
@@ -556,7 +556,7 @@
     Value *Src = EmitScalarExpr(E->getArg(1));
     Value *SizeVal = llvm::ConstantInt::get(Builder.getContext(), Size);
     Builder.CreateMemCpy(Dest, Src, SizeVal, 1, false);
-    return RValue::get(0);
+    return RValue::get(Dest);
   }
       
   case Builtin::BI__builtin_objc_memmove_collectable: {
@@ -581,7 +581,7 @@
     Value *Src = EmitScalarExpr(E->getArg(1));
     Value *SizeVal = llvm::ConstantInt::get(Builder.getContext(), Size);
     Builder.CreateMemMove(Dest, Src, SizeVal, 1, false);
-    return RValue::get(0);
+    return RValue::get(Dest);
   }
 
   case Builtin::BImemmove:
@@ -616,7 +616,7 @@
     Value *SizeVal = llvm::ConstantInt::get(Builder.getContext(), Size);
     Builder.CreateMemSet(Address, ByteVal, SizeVal, 1, false);
     
-    return RValue::get(0);
+    return RValue::get(Address);
   }
   case Builtin::BI__builtin_dwarf_cfa: {
     // The offset in bytes from the first argument to the CFA.

Modified: cfe/trunk/test/CodeGen/builtin-memfns.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/builtin-memfns.c?rev=129892&r1=129891&r2=129892&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/builtin-memfns.c (original)
+++ cfe/trunk/test/CodeGen/builtin-memfns.c Wed Apr 20 18:14:50 2011
@@ -42,3 +42,9 @@
 void test5(char *P, char *Q) {
   __builtin___memmove_chk(P, Q, 128, 128);
 }
+
+// CHECK: @test6
+// CHECK: call void @llvm.memcpy
+int test6(char *X) {
+  return __builtin___memcpy_chk(X, X, 42, 42) != 0;
+}