summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2010-07-29 16:53:53 +0000
committerFariborz Jahanian <fjahanian@apple.com>2010-07-29 16:53:53 +0000
commitc15dfd8a87b15dd4fde2ff7bf5e2ecc73e9ff7cc (patch)
tree47e017766cef701b8c809e4759709b6714d3d271 /clang/lib/Sema
parente9bf2d159c8dc747becc32007b8c222af9f7d425 (diff)
downloadbcm5719-llvm-c15dfd8a87b15dd4fde2ff7bf5e2ecc73e9ff7cc.tar.gz
bcm5719-llvm-c15dfd8a87b15dd4fde2ff7bf5e2ecc73e9ff7cc.zip
Tigthen the condition for issung ivar shadowing
variables to those in file scope (nonfragile-abi2). Fixes radar 8248681. llvm-svn: 109758
Diffstat (limited to 'clang/lib/Sema')
-rw-r--r--clang/lib/Sema/SemaExpr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 6f971b116d6..a934adfb0c4 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) {
OpenPOWER on IntegriCloud