diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp
index 8a3672d..293fe25 100644
--- a/clang/lib/Parse/ParseObjc.cpp
+++ b/clang/lib/Parse/ParseObjc.cpp
@@ -328,11 +328,12 @@
           PP.getSelectorTable().getNullarySelector(SelName);
         IdentifierInfo *SetterName = OCDS.getSetterName();
         if (!SetterName)
-          SetterName = 
-            SelectorTable::constructSetterName(PP.getIdentifierTable(),
-                                               FD.D.getIdentifier());
+          SetterName = FD.D.getIdentifier();
+          
         Selector SetterSel = 
-          PP.getSelectorTable().getUnarySelector(SetterName);
+            SelectorTable::constructSetterName(PP.getIdentifierTable(),
+                                               PP.getSelectorTable(),
+                                               SetterName);
         bool isOverridingProperty = false;
         DeclTy *Property = Actions.ActOnProperty(CurScope, AtLoc, FD, OCDS,
                                                  GetterSel, SetterSel,