Simplify SelectorTable::constructSetterName() usage...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66551 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 11 insertions, 11 deletions

diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index 8a3672d29c..293fe257cc 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -328,11 +328,12 @@ void Parser::ParseObjCInterfaceDeclList(DeclTy *interfaceDecl,
           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,
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index f37c0d5bad..df8afa450b 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -1886,10 +1886,9 @@ Sema::ActOnMemberReferenceExpr(Scope *S, ExprArg Base, SourceLocation OpLoc,
 
       // If we found a getter then this may be a valid dot-reference, we
       // will look for the matching setter, in case it is needed.
-      IdentifierInfo *SetterName = 
-        SelectorTable::constructSetterName(PP.getIdentifierTable(), &Member);
-        
-      Selector SetterSel = PP.getSelectorTable().getUnarySelector(SetterName);
+      Selector SetterSel = 
+        SelectorTable::constructSetterName(PP.getIdentifierTable(), 
+                                           PP.getSelectorTable(), &Member);
       ObjCMethodDecl *Setter = IFace->lookupInstanceMethod(SetterSel);
       if (!Setter) {
         // If this reference is in an @implementation, also check for 'private'
diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index 98fbd96331..ce9fe89719 100644
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -298,10 +298,10 @@ Action::OwningExprResult Sema::ActOnClassPropertyRefExpr(
   }
   
   // Look for the matching setter, in case it is needed.
-  IdentifierInfo *SetterName = 
-    SelectorTable::constructSetterName(PP.getIdentifierTable(), &propertyName);
+  Selector SetterSel = 
+    SelectorTable::constructSetterName(PP.getIdentifierTable(), 
+                                       PP.getSelectorTable(), &propertyName);
     
-  Selector SetterSel = PP.getSelectorTable().getUnarySelector(SetterName);
   ObjCMethodDecl *Setter = IFace->lookupClassMethod(SetterSel);
   if (!Setter) {
     // If this reference is in an @implementation, also check for 'private'