maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fixed conflict between objc_memmove_collectable builtin 

decl. and one ddefined in darwin header file.

llvm-svn: 106107
This commit is contained in:
Fariborz Jahanian 2010-06-16 16:22:04 +00:00
parent a92c442437
commit 4a30307840
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/Builtins.def
View File

@ -540,7 +540,7 @@ LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h")
// 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")

2
clang/lib/CodeGen/CGBuiltin.cpp
View File

@ -485,7 +485,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
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));

7
clang/lib/Sema/SemaDeclCXX.cpp
View File

@ -4567,7 +4567,7 @@ void Sema::DefineImplicitCopyAssignment(SourceLocation CurrentLocation,
// \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 @@ void Sema::DefineImplicitCopyAssignment(SourceLocation CurrentLocation,
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);