[PATCH] Re-adding the isSpelledAsLValue check in Consumed analysis

[Chris Wailes]

  This patch fixes an issue where the previous one would fail an assertion check when attempting to see if a non-canonical type was spelled as an LValue.  Previously, this was avoided by checking the spelling of the ParamType's canonical type, but this no longer works.

Hi rsmith, delesley, aaron.ballman,

http://llvm-reviews.chandlerc.com/D2872

CHANGE SINCE LAST DIFF
  http://llvm-reviews.chandlerc.com/D2872?vs=7323&id=7325#toc

Files:
  lib/Analysis/Consumed.cpp
  test/SemaCXX/warn-consumed-analysis.cpp

Index: lib/Analysis/Consumed.cpp
===================================================================
--- lib/Analysis/Consumed.cpp
+++ lib/Analysis/Consumed.cpp
@@ -183,8 +183,10 @@
   llvm_unreachable("invalid enum");
 }
 
-static bool isRValueRef(QualType ParamType) {
-  return ParamType->isRValueReferenceType();
+static bool isLikeRValueRef(QualType ParamType) {
+  return ParamType->isRValueReferenceType() ||
+         (isa<LValueReferenceType>(ParamType) &&
+          !cast<LValueReferenceType>(ParamType)->isSpelledAsLValue());
 }
 
 static bool isTestingFunction(const FunctionDecl *FunDecl) {
@@ -637,7 +639,7 @@
       continue;
 
     // Adjust state on the caller side.
-    if (isRValueRef(ParamType))
+    if (isLikeRValueRef(ParamType))
       setStateForVarOrTmp(StateMap, PInfo, consumed::CS_Consumed);
     else if (ReturnTypestateAttr *RT = Param->getAttr<ReturnTypestateAttr>())
       setStateForVarOrTmp(StateMap, PInfo, mapReturnTypestateAttrState(RT));
@@ -881,7 +883,7 @@
     ParamState = mapParamTypestateAttrState(PTA);    
   else if (isConsumableType(ParamType))
     ParamState = mapConsumableAttrState(ParamType);    
-  else if (isRValueRef(ParamType) &&
+  else if (isLikeRValueRef(ParamType) &&
            isConsumableType(ParamType->getPointeeType()))
     ParamState = mapConsumableAttrState(ParamType->getPointeeType());    
   else if (ParamType->isReferenceType() &&
Index: test/SemaCXX/warn-consumed-analysis.cpp
===================================================================
--- test/SemaCXX/warn-consumed-analysis.cpp
+++ test/SemaCXX/warn-consumed-analysis.cpp
@@ -11,6 +11,16 @@
 
 typedef decltype(nullptr) nullptr_t;
 
+template <class T> struct remove_reference      {typedef T type;};
+template <class T> struct remove_reference<T&>  {typedef T type;};
+template <class T> struct remove_reference<T&&> {typedef T type;};
+
+template<class T> 
+typename remove_reference<T>::type&& move(T&& a) noexcept {
+  typedef typename remove_reference<T>::type&& RvalRef;
+  return static_cast<RvalRef>(a);
+} 
+
 template <typename T>
 class CONSUMABLE(unconsumed) ConsumableClass {
   T var;
@@ -135,6 +145,11 @@
   
   *var0;
   *var1; // expected-warning {{invalid invocation of method 'operator*' on object 'var1' while it is in the 'consumed' state}}
+  
+  var1 = move(var0);
+  
+  *var0; // expected-warning {{invalid invocation of method 'operator*' on object 'var0' while it is in the 'consumed' state}}
+  *var1;
 }
 
 void testIfStmt() {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D2872.2.patch
Type: text/x-patch
Size: 2498 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140224/a3fe527b/attachment.bin>