From 3655e596882ac6381b70f02a0d97fac2a0ae94dc Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Tue, 9 Nov 2010 02:24:08 +0000
Subject: [PATCH] Reverse patch for // rdar://8632525. It might has broken a
 build.

llvm-svn: 118475
---
 clang/include/clang/Basic/Builtins.def         | 7 ++++---
 clang/lib/AST/ASTContext.cpp                   | 6 ------
 clang/test/CodeGenObjC/implicit-objc_msgSend.m | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/clang/include/clang/Basic/Builtins.def b/clang/include/clang/Basic/Builtins.def
index 28a507840986..eca73774f0c9 100644
--- a/clang/include/clang/Basic/Builtins.def
+++ b/clang/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/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 26e53ca57a69..b2451a2d867d 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/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/clang/test/CodeGenObjC/implicit-objc_msgSend.m b/clang/test/CodeGenObjC/implicit-objc_msgSend.m
index 322f82e920a0..a21e869229a7 100644
--- a/clang/test/CodeGenObjC/implicit-objc_msgSend.m
+++ b/clang/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) {