Simplify previous commit.
llvm-svn: 60416
diff --git a/clang/Driver/RewriteObjC.cpp b/clang/Driver/RewriteObjC.cpp
index 7f55d79..68ba314 100644
--- a/clang/Driver/RewriteObjC.cpp
+++ b/clang/Driver/RewriteObjC.cpp
@@ -609,19 +609,19 @@
return; // FIXME: is this correct?
// Generate the 'getter' function.
- std::string Getr;
ObjCPropertyDecl *PD = PID->getPropertyDecl();
-
- RewriteObjCMethodDecl(PD->getGetterMethodDecl(), Getr);
ObjCInterfaceDecl *ClassDecl = PD->getGetterMethodDecl()->getClassInterface();
-
- Getr += "{ ";
ObjCIvarDecl *OID = PID->getPropertyIvarDecl();
- if (OID) {
- // Synthesize an explicit cast to gain access to the ivar.
- Getr += "return " + getIvarAccessString(ClassDecl, OID);
- Getr += "; }";
- }
+
+ if (!OID)
+ return;
+
+ std::string Getr;
+ RewriteObjCMethodDecl(PD->getGetterMethodDecl(), Getr);
+ Getr += "{ ";
+ // Synthesize an explicit cast to gain access to the ivar.
+ Getr += "return " + getIvarAccessString(ClassDecl, OID);
+ Getr += "; }";
InsertText(onePastSemiLoc, Getr.c_str(), Getr.size());
if (PD->isReadOnly())
@@ -630,14 +630,11 @@
// Generate the 'setter' function.
std::string Setr;
RewriteObjCMethodDecl(PD->getSetterMethodDecl(), Setr);
-
Setr += "{ ";
- if (OID) {
- // Synthesize an explicit cast to initialize the ivar.
- Setr += getIvarAccessString(ClassDecl, OID) + " = ";
- Setr += OID->getNameAsCString();
- Setr += "; }";
- }
+ // Synthesize an explicit cast to initialize the ivar.
+ Setr += getIvarAccessString(ClassDecl, OID) + " = ";
+ Setr += OID->getNameAsCString();
+ Setr += "; }";
InsertText(onePastSemiLoc, Setr.c_str(), Setr.size());
}