[cfe-commits] r106107 - in /cfe/trunk: include/clang/Basic/Builtins.def lib/CodeGen/CGBuiltin.cpp lib/Sema/SemaDeclCXX.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Wed Jun 16 11:22:04 2010
New Revision: 106107

URL: http://llvm.org/viewvc/llvm-project?rev=106107&view=rev
Log:
Fixed conflict between objc_memmove_collectable builtin 
decl. and one ddefined in darwin header file.

Modified:
    cfe/trunk/include/clang/Basic/Builtins.def
    cfe/trunk/lib/CodeGen/CGBuiltin.cpp
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp

Modified: cfe/trunk/include/clang/Basic/Builtins.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Builtins.def?rev=106107&r1=106106&r2=106107&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/Builtins.def (original)
+++ cfe/trunk/include/clang/Basic/Builtins.def Wed Jun 16 11:22:04 2010
@@ -540,7 +540,7 @@
 //   id objc_msgSend(id, SEL)
 // but we need new type letters for that.
 LIBBUILTIN(objc_msgSend, "v*.",   "f",     "objc/message.h")
-LIBBUILTIN(objc_memmove_collectable, "v*v*vC*z", "nF", "objc/objc-auto.h")
+BUILTIN(__builtin_objc_memmove_collectable, "v*v*vC*z", "nF")
 
 // Builtin math library functions
 LIBBUILTIN(pow, "ddd", "fe", "math.h")

Modified: cfe/trunk/lib/CodeGen/CGBuiltin.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBuiltin.cpp?rev=106107&r1=106106&r2=106107&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGBuiltin.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGBuiltin.cpp Wed Jun 16 11:22:04 2010
@@ -485,7 +485,7 @@
     return RValue::get(Address);
   }
       
-  case Builtin::BIobjc_memmove_collectable: {
+  case Builtin::BI__builtin_objc_memmove_collectable: {
     Value *Address = EmitScalarExpr(E->getArg(0));
     Value *SrcAddr = EmitScalarExpr(E->getArg(1));
     Value *SizeVal = EmitScalarExpr(E->getArg(2));

Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=106107&r1=106106&r2=106107&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Wed Jun 16 11:22:04 2010
@@ -4567,7 +4567,7 @@
   
   // \brief Reference to the __builtin_memcpy function.
   Expr *BuiltinMemCpyRef = 0;
-  // \brief Reference to the objc_memmove_collectable function.
+  // \brief Reference to the __builtin_objc_memmove_collectable function.
   Expr *CollectableMemCpyRef = 0;
   
   // Assign non-static members.
@@ -4652,8 +4652,9 @@
           
       if (NeedsCollectableMemCpy) {
         if (!CollectableMemCpyRef) {
-          // Create a reference to the objc_memmove_collectable function.
-          LookupResult R(*this, &Context.Idents.get("objc_memmove_collectable"), 
+          // Create a reference to the __builtin_objc_memmove_collectable function.
+          LookupResult R(*this, 
+                         &Context.Idents.get("__builtin_objc_memmove_collectable"), 
                          Loc, LookupOrdinaryName);
           LookupName(R, TUScope, true);