Renaming the CallableState variadic attribute argument to be CallableStates. No funct...

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

diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index bc16819ac20b4f7db2071faa9f1e8ca474b38a6e..3be16d2aba554b0543208fb474ef1c35d8b002bc 100644 (file)
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -1568,7 +1568,7 @@ def ConsumableSetOnRead : InheritableAttr {
 def CallableWhen : InheritableAttr {
   let Spellings = [GNU<"callable_when">];
   let Subjects = SubjectList<[CXXMethod]>;
-  let Args = [VariadicEnumArgument<"CallableState", "ConsumedState",
+  let Args = [VariadicEnumArgument<"CallableStates", "ConsumedState",
                                    ["unknown", "consumed", "unconsumed"],
                                    ["Unknown", "Consumed", "Unconsumed"]>];
   let Documentation = [CallableWhenDocs];

diff --git a/lib/Analysis/Consumed.cpp b/lib/Analysis/Consumed.cpp
index aac5658d565e4bef084ea53f3ce917651cdafe32..e0a9d512c81153fd065c09870157402f8053d604 100644 (file)
--- a/lib/Analysis/Consumed.cpp
+++ b/lib/Analysis/Consumed.cpp
@@ -113,8 +113,8 @@ static ConsumedState invertConsumedUnconsumed(ConsumedState State) {
 static bool isCallableInState(const CallableWhenAttr *CWAttr,
                               ConsumedState State) {
   
-  CallableWhenAttr::callableState_iterator I = CWAttr->callableState_begin(),
-                                           E = CWAttr->callableState_end();
+  CallableWhenAttr::callableStates_iterator I = CWAttr->callableStates_begin(),
+                                            E = CWAttr->callableStates_end();
   
   for (; I != E; ++I) {