diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-11-09 02:24:08 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-11-09 02:24:08 +0000 |
| commit | c8c62c4075688b206dc9ac2c5b24a362018b718b (patch) | |
| tree | 41d009d8edc0db706493ce6f02512020423d5167 | |
| parent | 24fce281e3bc2f7ef78e8a57ff485a99954f81a7 (diff) | |
Reverse patch for // rdar://8632525. It might
has broken a build.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@118475 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/Builtins.def | 7 | ||||
| -rw-r--r-- | lib/AST/ASTContext.cpp | 6 | ||||
| -rw-r--r-- | test/CodeGenObjC/implicit-objc_msgSend.m | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/include/clang/Basic/Builtins.def b/include/clang/Basic/Builtins.def index 28a5078409..eca73774f0 100644 --- a/include/clang/Basic/Builtins.def +++ b/include/clang/Basic/Builtins.def @@ -29,8 +29,6 @@ // d -> double // z -> size_t // F -> constant CFString -// G -> id -// H -> SEL // a -> __builtin_va_list // A -> "reference" to __builtin_va_list // V -> Vector, following num elements and a base type. @@ -561,8 +559,11 @@ LIBBUILTIN(_exit, "vi", "fr", "unistd.h") // POSIX setjmp.h LIBBUILTIN(_longjmp, "vJi", "fr", "setjmp.h") LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h") + +// FIXME: This type isn't very correct, it should be // id objc_msgSend(id, SEL) -LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h") +// but we need new type letters for that. +LIBBUILTIN(objc_msgSend, "v*.", "f", "objc/message.h") BUILTIN(__builtin_objc_memmove_collectable, "v*v*vC*z", "nF") // Builtin math library functions diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 26e53ca57a..b2451a2d86 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -5384,12 +5384,6 @@ static QualType DecodeTypeFromStr(const char *&Str, ASTContext &Context, case 'F': Type = Context.getCFConstantStringType(); break; - case 'G': - Type = Context.getObjCIdType(); - break; - case 'H': - Type = Context.getObjCSelType(); - break; case 'a': Type = Context.getBuiltinVaListType(); assert(!Type.isNull() && "builtin va list type not initialized!"); diff --git a/test/CodeGenObjC/implicit-objc_msgSend.m b/test/CodeGenObjC/implicit-objc_msgSend.m index 322f82e920..a21e869229 100644 --- a/test/CodeGenObjC/implicit-objc_msgSend.m +++ b/test/CodeGenObjC/implicit-objc_msgSend.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin9 -emit-llvm -o %t %s -// RUN: grep -F 'declare i8* @objc_msgSend(i8*, i8*, ...)' %t +// RUN: grep -F 'declare i8* @objc_msgSend(...)' %t typedef struct objc_selector *SEL; id f0(id x, SEL s) { |