Fix regression in naming convention derivation: a method only follows the copy 'rule' if it doesn't already start with 'init', etc.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65269 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index d8c2fb0..29ad73f 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -120,7 +120,7 @@
// Methods starting with 'alloc' or contain 'copy' follow the
// create rule
if ((AtBeginning && StringsEqualNoCase("alloc", s, len)) ||
- (StringsEqualNoCase("copy", s, len)))
+ (C == NoConvention && StringsEqualNoCase("copy", s, len)))
C = CreateRule;
else // Methods starting with 'init' follow the init rule.
if (AtBeginning && StringsEqualNoCase("init", s, len))