diff options
Diffstat (limited to 'lib/Analysis')
| -rw-r--r-- | lib/Analysis/BasicObjCFoundationChecks.cpp | 4 | ||||
| -rw-r--r-- | lib/Analysis/CFRefCount.cpp | 4 | ||||
| -rw-r--r-- | lib/Analysis/CheckObjCInstMethSignature.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/Analysis/BasicObjCFoundationChecks.cpp b/lib/Analysis/BasicObjCFoundationChecks.cpp index 033dc02cd7..d81b3343c9 100644 --- a/lib/Analysis/BasicObjCFoundationChecks.cpp +++ b/lib/Analysis/BasicObjCFoundationChecks.cpp @@ -91,7 +91,7 @@ public: std::ostringstream os; os << "Argument to '" << GetReceiverNameType(ME) << "' method '" - << ME->getSelector().getName() << "' cannot be nil."; + << ME->getSelector().getAsString() << "' cannot be nil."; Msg = os.str(); s = Msg.c_str(); @@ -243,7 +243,7 @@ bool BasicObjCFoundationChecks::AuditNSString(NodeTy* N, // FIXME: This is going to be really slow doing these checks with // lexical comparisons. - std::string name = S.getName(); + std::string name = S.getAsString(); assert (!name.empty()); const char* cstr = &name[0]; unsigned len = name.size(); diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index 8c16c9fd6b..56f5ab6234 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -1887,7 +1887,7 @@ CFRefCount::HandleSymbolDeath(GRStateManager& VMgr, if (V.isReturnedOwned() && V.getCount() == 0) if (const ObjCMethodDecl* MD = dyn_cast<ObjCMethodDecl>(CD)) { - std::string s = MD->getSelector().getName(); + std::string s = MD->getSelector().getAsString(); if (!followsReturnRule(s.c_str())) { hasLeak = true; state = state.set<RefBindings>(sid, V ^ RefVal::ErrorLeakReturned); @@ -2635,7 +2635,7 @@ PathDiagnosticPiece* CFRefReport::getEndPath(BugReporter& br, if (RV->getKind() == RefVal::ErrorLeakReturned) { ObjCMethodDecl& MD = cast<ObjCMethodDecl>(BR.getGraph().getCodeDecl()); os << " is returned from a method whose name ('" - << MD.getSelector().getName() + << MD.getSelector().getAsString() << "') does not contain 'create' or 'copy' or otherwise starts with" " 'new' or 'alloc'. This violates the naming convention rules given" " in the Memory Management Guide for Cocoa (object leaked)."; diff --git a/lib/Analysis/CheckObjCInstMethSignature.cpp b/lib/Analysis/CheckObjCInstMethSignature.cpp index ffaef42b23..00dbe9f2b2 100644 --- a/lib/Analysis/CheckObjCInstMethSignature.cpp +++ b/lib/Analysis/CheckObjCInstMethSignature.cpp @@ -53,7 +53,7 @@ static void CompareReturnTypes(ObjCMethodDecl* MethDerived, << "', which is derived from class '" << MethAncestor->getClassInterface()->getName() << "', defines the instance method '" - << MethDerived->getSelector().getName() + << MethDerived->getSelector().getAsString() << "' whose return type is '" << ResDerived.getAsString() << "'. A method with the same name (same selector) is also defined in " |