diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 5 | ||||
| -rw-r--r-- | test/SemaObjC/default-synthesize.m | 16 |
2 files changed, 8 insertions, 13 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index fbdf080bc4..2dfb95435d 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -1345,11 +1345,6 @@ Sema::LookupInObjCMethod(LookupResult &Lookup, Scope *S, } } } - if (LangOpts.ObjCNonFragileABI2 && LookForIvars && Lookup.empty()) { - ObjCIvarDecl *Ivar = SynthesizeNewPropertyIvar(IFace, II); - if (Ivar) - return LookupInObjCMethod(Lookup, S, II, AllowBuiltinCreation); - } // Sentinel value saying that we didn't do anything special. return Owned((Expr*) 0); } diff --git a/test/SemaObjC/default-synthesize.m b/test/SemaObjC/default-synthesize.m index be2397bd20..45a3710dcf 100644 --- a/test/SemaObjC/default-synthesize.m +++ b/test/SemaObjC/default-synthesize.m @@ -23,12 +23,12 @@ //@synthesize howMany, what; - (int) howMany { - return howMany; + return self.howMany; } // - (void) setHowMany: (int) value - (NSString*) what { - return what; + return self.what; } // - (void) setWhat: (NSString*) value @end @@ -44,12 +44,12 @@ // - (int) howMany - (void) setHowMany: (int) value { - howMany = value; + self.howMany = value; } // - (NSString*) what - (void) setWhat: (NSString*) value { - if (what != value) { + if (self.what != value) { } } @end @@ -64,17 +64,17 @@ //@synthesize howMany, what; // REM: Redundant anyway - (int) howMany { - return howMany; + return self.howMany; } - (void) setHowMany: (int) value { - howMany = value; + self.howMany = value; } - (NSString*) what { - return what; + return self.what; } - (void) setWhat: (NSString*) value { - if (what != value) { + if (self.what != value) { } } @end |