commit fdc92b7877535e6264fe43cfbdc8f01e9b224f81
author Steve Naroff <snaroff@apple.com> Tue Mar 10 17:24:38 2009 +0000
committer Steve Naroff <snaroff@apple.com> Tue Mar 10 17:24:38 2009 +0000
tree 409b81e53d3a0e650602903acdc4ea9f10c9fe40
parent 4843e584b54460973b8445d38907bab0401ebb0c

Simplify SelectorTable::constructSetterName() usage...


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

lib/Parse/ParseObjc.cpp

diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index 8a3672d..293fe25 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/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,

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index f37c0d5..df8afa4 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -1886,10 +1886,9 @@
 
       // 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'

lib/Sema/SemaExprObjC.cpp

diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index 98fbd96..ce9fe89 100644
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -298,10 +298,10 @@
   }
   
   // 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'