From b3b1e17645ba01ecae56a8f217aec96a690a014c Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Sun, 27 Mar 2011 19:53:47 +0000
Subject: [PATCH] 'self' is objective-c's 'self' objc pointer only in an objc
 method. Fixes // rdar://9181463

llvm-svn: 128389
---
 clang/lib/Sema/SemaExprObjC.cpp        |  3 +++
 clang/test/SemaObjC/self-in-function.m | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 clang/test/SemaObjC/self-in-function.m

diff --git a/clang/lib/Sema/SemaExprObjC.cpp b/clang/lib/Sema/SemaExprObjC.cpp
index 6b6600740fe1..22a1b19921b9 100644
--- a/clang/lib/Sema/SemaExprObjC.cpp
+++ b/clang/lib/Sema/SemaExprObjC.cpp
@@ -324,6 +324,9 @@ bool Sema::CheckMessageArgumentTypes(Expr **Args, unsigned NumArgs,
 }
 
 bool Sema::isSelfExpr(Expr *RExpr) {
+  // 'self' is objc 'self' in an objc method only.
+  if (!isa<ObjCMethodDecl>(CurContext))
+    return false;
   if (ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(RExpr))
     if (ICE->getCastKind() == CK_LValueToRValue)
       RExpr = ICE->getSubExpr();
diff --git a/clang/test/SemaObjC/self-in-function.m b/clang/test/SemaObjC/self-in-function.m
new file mode 100644
index 000000000000..901cc31e47ae
--- /dev/null
+++ b/clang/test/SemaObjC/self-in-function.m
@@ -0,0 +1,23 @@
+// RUN: %clang_cc1  -fsyntax-only -verify %s
+// rdar://9181463
+
+typedef struct objc_class *Class;
+
+typedef struct objc_object {
+    Class isa;
+} *id;
+
+@interface NSObject
++ (id) alloc;
+@end
+
+
+void foo(Class self) {
+  [self alloc];
+}
+
+void bar(Class self) {
+  Class y = self;
+  [y alloc];
+}
+