diff options
| author | Ted Kremenek <kremenek@apple.com> | 2009-04-24 18:19:07 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2009-04-24 18:19:07 +0000 |
| commit | ff11cd148b66fb4dfb4eef5b9f8c711ab80bd634 (patch) | |
| tree | 38ff3997a3423c2991c02dfbb8d24b8fbcc1f654 /lib/Analysis/CFRefCount.cpp | |
| parent | 376d1e72c31c8b362eb3a035751c662140a7e5d7 (diff) | |
Minor refactoring: pass selector to getCommonMethodSummary(). No functionality
change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69985 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Analysis/CFRefCount.cpp')
| -rw-r--r-- | lib/Analysis/CFRefCount.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index 1021574de6..7b16007a7a 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -721,7 +721,7 @@ public: RetainSummary* getSummary(FunctionDecl* FD); RetainSummary* getMethodSummary(ObjCMessageExpr* ME, ObjCInterfaceDecl* ID); RetainSummary* getClassMethodSummary(ObjCMessageExpr *ME); - RetainSummary* getCommonMethodSummary(ObjCMessageExpr *ME, const char *s); + RetainSummary* getCommonMethodSummary(ObjCMessageExpr *ME, Selector S); bool isGCEnabled() const { return GCEnabled; } }; @@ -1074,7 +1074,7 @@ RetainSummaryManager::getInitMethodSummary(ObjCMessageExpr* ME) { RetainSummary* -RetainSummaryManager::getCommonMethodSummary(ObjCMessageExpr* ME, const char *s) +RetainSummaryManager::getCommonMethodSummary(ObjCMessageExpr* ME, Selector S) { if (ObjCMethodDecl *MD = ME->getMethodDecl()) { // Scan the method decl for 'void*' arguments. These should be treated @@ -1103,7 +1103,7 @@ RetainSummaryManager::getCommonMethodSummary(ObjCMessageExpr* ME, const char *s) // by instance methods. RetEffect E = - followsFundamentalRule(s) + followsFundamentalRule(S.getIdentifierInfoForSlot(0)->getName()) ? (isGCEnabled() ? RetEffect::MakeNotOwned(RetEffect::ObjC) : RetEffect::MakeOwned(RetEffect::ObjC, true)) : RetEffect::MakeNotOwned(RetEffect::ObjC); @@ -1124,13 +1124,13 @@ RetainSummaryManager::getMethodSummary(ObjCMessageExpr* ME, return I->second; // "initXXX": pass-through for receiver. - const char* s = S.getIdentifierInfoForSlot(0)->getName(); assert(ScratchArgs.empty()); - if (deriveNamingConvention(s) == InitRule) + if (deriveNamingConvention(S.getIdentifierInfoForSlot(0)->getName()) + == InitRule) return getInitMethodSummary(ME); - RetainSummary *Summ = getCommonMethodSummary(ME, s); + RetainSummary *Summ = getCommonMethodSummary(ME, S); ObjCMethodSummaries[ME] = Summ; return Summ; } @@ -1156,9 +1156,7 @@ RetainSummaryManager::getClassMethodSummary(ObjCMessageExpr *ME) { if (I != ObjCClassMethodSummaries.end()) return I->second; - RetainSummary* Summ = - getCommonMethodSummary(ME, S.getIdentifierInfoForSlot(0)->getName()); - + RetainSummary* Summ = getCommonMethodSummary(ME, S); ObjCClassMethodSummaries[ObjCSummaryKey(ME->getClassName(), S)] = Summ; return Summ; } |