From c15dfd8a87b15dd4fde2ff7bf5e2ecc73e9ff7cc Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Thu, 29 Jul 2010 16:53:53 +0000
Subject: [PATCH] Tigthen the condition for issung ivar shadowing variables to
 those in file scope (nonfragile-abi2). Fixes radar 8248681.

llvm-svn: 109758
---
 clang/lib/Sema/SemaExpr.cpp                   |  3 ++-
 .../test/SemaObjC/conflict-nonfragile-abi2.m  | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 6f971b116d61..a934adfb0c4b 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -1170,7 +1170,8 @@ Sema::OwningExprResult Sema::ActOnIdExpression(Scope *S,
 
   if (VarDecl *Var = R.getAsSingle<VarDecl>()) {
     if (getLangOptions().ObjCNonFragileABI && IvarLookupFollowUp &&
-        !getLangOptions().ObjCNonFragileABI2) {
+        !getLangOptions().ObjCNonFragileABI2 &&
+        Var->isFileVarDecl()) {
       ObjCPropertyDecl *Property = 
         OkToSynthesizeProvisionalIvar(*this, II, NameLoc);
       if (Property) {
diff --git a/clang/test/SemaObjC/conflict-nonfragile-abi2.m b/clang/test/SemaObjC/conflict-nonfragile-abi2.m
index 49cff97ccbd1..14e666000c60 100644
--- a/clang/test/SemaObjC/conflict-nonfragile-abi2.m
+++ b/clang/test/SemaObjC/conflict-nonfragile-abi2.m
@@ -5,9 +5,30 @@ int glob;
 
 @interface I
 @property int glob; // expected-note {{property declared here}}
+@property int p;
+@property int le;
+@property int l;
+@property int ls;
+@property int r;
 @end
 
 @implementation I
 - (int) Meth { return glob; } // expected-warning {{'glob' lookup will access the property ivar in nonfragile-abi2 mode}}
 @synthesize glob;
+// rdar: // 8248681
+- (int) Meth1: (int) p {
+  extern int le;
+  int l = 1;
+  static int ls;
+  register int r;
+  p = le + ls + r;
+  return l;
+}
+@dynamic p;
+@dynamic le;
+@dynamic l;
+@dynamic ls;
+@dynamic r;
 @end
+
+