Some refactoring of property rewriting stuff
in rewriter. No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116254 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Rewrite/RewriteObjC.cpp b/lib/Rewrite/RewriteObjC.cpp
index 745b788..339b7d1 100644
--- a/lib/Rewrite/RewriteObjC.cpp
+++ b/lib/Rewrite/RewriteObjC.cpp
@@ -5356,12 +5356,9 @@
if (BinaryOperator *BinOp = dyn_cast<BinaryOperator>(S)) {
if (BinOp->isAssignmentOp()) {
- if (ObjCPropertyRefExpr *PRE =
- dyn_cast<ObjCPropertyRefExpr>(BinOp->getLHS()))
- PropSetters[PRE] = BinOp;
- else if (ObjCImplicitSetterGetterRefExpr *ISE =
- dyn_cast<ObjCImplicitSetterGetterRefExpr>(BinOp->getLHS()))
- PropSetters[ISE] = BinOp;
+ if (isa<ObjCPropertyRefExpr>(BinOp->getLHS()) ||
+ isa<ObjCImplicitSetterGetterRefExpr>(BinOp->getLHS()))
+ PropSetters[BinOp->getLHS()] = BinOp;
}
}
}
@@ -5402,18 +5399,15 @@
// expression, the entire assignment tree is rewritten into a property
// setter messaging. This involvs the RHS too. Do not attempt to rewrite
// RHS again.
- if (ObjCPropertyRefExpr *PRE = dyn_cast<ObjCPropertyRefExpr>(S))
- if (PropSetters[PRE]) {
- ++CI;
- continue;
+ if (Expr *Exp = dyn_cast<Expr>(S))
+ if (isa<ObjCPropertyRefExpr>(Exp) ||
+ isa<ObjCImplicitSetterGetterRefExpr>(Exp)) {
+ if (PropSetters[Exp]) {
+ ++CI;
+ continue;
+ }
}
- if (ObjCImplicitSetterGetterRefExpr *ISE =
- dyn_cast<ObjCImplicitSetterGetterRefExpr>(S))
- if (PropSetters[ISE]) {
- ++CI;
- continue;
- }
- }
+ }
if (BlockExpr *BE = dyn_cast<BlockExpr>(S)) {
llvm::SmallVector<BlockDeclRefExpr *, 8> InnerBlockDeclRefs;