Guard lazy synthesis of provisional ivars under the new
-fobjc-default-synthesize-properties flag. llvm-svn: 122757
This commit is contained in:
parent
7cd69249fa
commit
c63f1c5ab6
|
@ -1470,7 +1470,8 @@ ExprResult Sema::ActOnIdExpression(Scope *S,
|
|||
Expr *Ex = E.takeAs<Expr>();
|
||||
if (Ex) return Owned(Ex);
|
||||
// Synthesize ivars lazily
|
||||
if (getLangOptions().ObjCNonFragileABI2) {
|
||||
if (getLangOptions().ObjCDefaultSynthProperties &&
|
||||
getLangOptions().ObjCNonFragileABI2) {
|
||||
if (SynthesizeProvisionalIvar(*this, R, II, NameLoc)) {
|
||||
if (const ObjCPropertyDecl *Property =
|
||||
canSynthesizeProvisionalIvar(II)) {
|
||||
|
@ -1527,7 +1528,8 @@ ExprResult Sema::ActOnIdExpression(Scope *S,
|
|||
|
||||
if (VarDecl *Var = R.getAsSingle<VarDecl>()) {
|
||||
if (getLangOptions().ObjCNonFragileABI && IvarLookupFollowUp &&
|
||||
!getLangOptions().ObjCNonFragileABI2 &&
|
||||
!(getLangOptions().ObjCDefaultSynthProperties &&
|
||||
getLangOptions().ObjCNonFragileABI2) &&
|
||||
Var->isFileVarDecl()) {
|
||||
ObjCPropertyDecl *Property = canSynthesizeProvisionalIvar(II);
|
||||
if (Property) {
|
||||
|
|
|
@ -559,7 +559,8 @@ Decl *Sema::ActOnPropertyImplDecl(Scope *S,
|
|||
return 0;
|
||||
}
|
||||
IC->addPropertyImplementation(PIDecl);
|
||||
if (getLangOptions().ObjCNonFragileABI2) {
|
||||
if (getLangOptions().ObjCDefaultSynthProperties &&
|
||||
getLangOptions().ObjCNonFragileABI2) {
|
||||
// Diagnose if an ivar was lazily synthesdized due to a previous
|
||||
// use and if 1) property is @dynamic or 2) property is synthesized
|
||||
// but it requires an ivar of different name.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s
|
||||
// RUN: %clang_cc1 -fsyntax-only -fobjc-default-synthesize-properties -fobjc-nonfragile-abi2 -verify %s
|
||||
|
||||
// rdar:// 8565343
|
||||
@interface Foo {
|
||||
|
|
Loading…
Reference in New Issue