Consumed analysis: switch from tests_consumed/unconsumed to a general

tests_typestate attribute.  Patch by chris.wailes@gmail.com.

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

1 files changed, 11 insertions, 4 deletions

diff --git a/test/SemaCXX/warn-consumed-analysis.cpp b/test/SemaCXX/warn-consumed-analysis.cpp
index 28b7794789..b11a74f95e 100644
--- a/test/SemaCXX/warn-consumed-analysis.cpp
+++ b/test/SemaCXX/warn-consumed-analysis.cpp
@@ -6,7 +6,7 @@
 #define CONSUMABLE(state)       __attribute__ ((consumable(state)))
 #define CONSUMES                __attribute__ ((consumes))
 #define RETURN_TYPESTATE(state) __attribute__ ((return_typestate(state)))
-#define TESTS_UNCONSUMED        __attribute__ ((tests_unconsumed))
+#define TESTS_TYPESTATE(state)  __attribute__ ((tests_typestate(state)))
 
 typedef decltype(nullptr) nullptr_t;
 
@@ -36,9 +36,10 @@ public:
   void unconsumedCall() const CALLABLE_WHEN("unconsumed");
   void callableWhenUnknown() const CALLABLE_WHEN("unconsumed", "unknown");
   
-  bool isValid() const TESTS_UNCONSUMED;
-  operator bool() const TESTS_UNCONSUMED;
-  bool operator!=(nullptr_t) const TESTS_UNCONSUMED;
+  bool isValid() const TESTS_TYPESTATE(unconsumed);
+  operator bool() const TESTS_TYPESTATE(unconsumed);
+  bool operator!=(nullptr_t) const TESTS_TYPESTATE(unconsumed);
+  bool operator==(nullptr_t) const TESTS_TYPESTATE(consumed);
   
   void constCall() const;
   void nonconstCall();
@@ -146,6 +147,12 @@ void testIfStmt() {
   } else {
     *var; // expected-warning {{invalid invocation of method 'operator*' on object 'var' while it is in the 'consumed' state}}
   }
+  
+  if (var == nullptr) {
+    *var; // expected-warning {{invalid invocation of method 'operator*' on object 'var' while it is in the 'consumed' state}}
+  } else {
+    // Empty
+  }
 }
 
 void testComplexConditionals0() {