Merge pull request #287 from andreasfertig/fixIssue286

Fixed #286: Desugar decltype(x) even when it is an LValueReference.

InsightsHelpers.cpp

@@ -716,6 +716,20 @@ class SimpleTypePrinter
         return ret;
     }
 
+    bool HandleType(const DecltypeType* type)
+    {
+        const bool skipSpace{mSkipSpace};
+        mSkipSpace = true;
+
+        HandleType(type->desugar().getTypePtrOrNull());
+
+        mSkipSpace = skipSpace;
+
+        // if we hit a DecltypeType always use the expanded version to support things like a DecltypeType wrapped in an
+        // LValueReferenceType
+        return true;
+    }
+
     bool HandleType(const Type* type)
     {
 #define HANDLE_TYPE(t)                                                                                                 \
@@ -744,6 +758,7 @@ class SimpleTypePrinter
         HANDLE_TYPE(InjectedClassNameType);
         HANDLE_TYPE(DependentTemplateSpecializationType);
         HANDLE_TYPE(PackExpansionType);
+        HANDLE_TYPE(DecltypeType);
 
 #undef HANDLE_TYPE
         return false;
@@ -789,16 +804,29 @@ class SimpleTypePrinter
             AddCVQualifiers(splitted.Quals);
         }
 
-        mHasData = HandleType(mType.getTypePtrOrNull());
+        const auto* typePtr = mType.getTypePtrOrNull();
+        mHasData            = HandleType(typePtr);
         mData.Append(mDataAfter);
 
+        // Take care of 'char* const'
+        if(mType.getQualifiers().hasFastQualifiers()) {
+            const QualType fastQualifierType{typePtr, mType.getQualifiers().getFastQualifiers()};
+
+            mSkipSpace = true;
+            AddCVQualifiers(fastQualifierType.getCanonicalType()->getPointeeType().getLocalQualifiers());
+        }
+
         return mHasData;
     }
 };
 //-----------------------------------------------------------------------------
 
-static std::string GetNameInternal(const QualType& t, const CppInsightsPrintingPolicy& printingPolicy)
+static std::string GetName(const QualType&             t,
+                           const Unqualified           unqualified  = Unqualified::No,
+                           const InsightsSuppressScope supressScope = InsightsSuppressScope::No)
 {
+    const CppInsightsPrintingPolicy printingPolicy{unqualified, supressScope};
+
     if(SimpleTypePrinter st{t, printingPolicy}; st.GetTypeString()) {
         return ScopeHandler::RemoveCurrentScope(st.GetString());
 
@@ -808,36 +836,6 @@ static std::string GetNameInternal(const QualType& t, const CppInsightsPrintingP
 
     return ScopeHandler::RemoveCurrentScope(GetAsCPPStyleString(t, printingPolicy));
 }
-//-----------------------------------------------------------------------------
-
-static bool IsDecltypeType(const QualType& t)
-{
-    if(t.getTypePtrOrNull()) {
-        if(isa<clang::DecltypeType>(t)) {
-            return true;
-        }
-    }
-
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-static std::string GetName(const QualType&             t,
-                           const Unqualified           unqualified  = Unqualified::No,
-                           const InsightsSuppressScope supressScope = InsightsSuppressScope::No)
-{
-    const auto                      desugaredType = GetDesugarType(t);
-    const auto*                     autoType      = desugaredType->getContainedAutoType();
-    const bool                      isAutoType{autoType && autoType->isSugared()};
-    const CppInsightsPrintingPolicy printingPolicy{unqualified, supressScope};
-
-    // Handle decltype(var)
-    if(not isAutoType && IsDecltypeType(t)) {
-        return GetNameInternal(desugaredType, printingPolicy);
-    }
-
-    return GetNameInternal(t, printingPolicy);
-}
 }  // namespace details
 //-----------------------------------------------------------------------------
 

tests/AutoHandlerTest.expect

@@ -68,9 +68,9 @@ int main()
   float f = 1.0F;
   char c = 'c';
   unsigned int u = 0U;
-  decltype(u) uu = u;
+  unsigned int uu = u;
   unsigned int mu = 0U;
-  decltype(u) muu = u;
+  unsigned int muu = u;
 }
 
 

tests/Issue255.expect

@@ -163,7 +163,7 @@ void test()
     for(; __begin1.operator!=(__end1); __begin1.operator++()) 
     {
       int element = __begin1.operator*();
-      /* PASSED: static_assert(std::is_same_v<decltype(element), int>); */
+      /* PASSED: static_assert(std::is_same_v<int, int>); */
     }
 
   }

tests/Issue286.cpp

@@ -0,0 +1,8 @@
+#include <vector>
+struct S {
+	std::vector<int> v{};
+    decltype(v)& getV () {
+      return v;
+    }
+};
+

tests/Issue286.expect

@@ -0,0 +1,13 @@
+#include <vector>
+struct S
+{
+  std::vector<int, std::allocator<int> > v = std::vector<int, std::allocator<int> >{};
+  inline std::vector<int, std::allocator<int> > & getV()
+  {
+    return this->v;
+  }
+
+};
+
+
+

tests/Issue286_2.cpp

@@ -0,0 +1,9 @@
+int main()
+{
+    int x= 2;
+
+    decltype(x)& y = x;
+
+    //return y;
+}
+

tests/Issue286_2.expect

@@ -0,0 +1,7 @@
+int main()
+{
+  int x = 2;
+  int & y = x;
+}
+
+

tests/StructuredBindingsHandler3Test.expect

@@ -9,7 +9,7 @@ namespace std
 }
 namespace std
 {
-  template<size_t , typename type_parameter_0_1>
+  template<unsigned long , typename type_parameter_0_1>
   struct tuple_element;
   /* First instantiated from: StructuredBindingsHandler3Test.cpp:17 */
   #ifdef INSIGHTS_USE_TEMPLATE
@@ -94,7 +94,7 @@ struct std::tuple_size<constant::Q>
 };
 
 
-template<size_t N>
+template<unsigned long N>
 struct std::tuple_element<N, constant::Q>
 {
   using type = int;