Merge pull request #590 from andreasfertig/fixIssue492

Fixed #492: Correctly handle lambda in `decltype`.

CodeGenerator.cpp

@@ -1506,10 +1506,15 @@ void CodeGenerator::InsertArg(const CXXDeleteExpr* stmt)
 
 void CodeGenerator::InsertConstructorExpr(const auto* stmt)
 {
-    if(P0315Visitor dt{*this}; not dt.TraverseType(stmt->getType())) {
+    {
+        CONDITIONAL_LAMBDA_SCOPE_HELPER(Decltype, not isa<DecltypeType>(stmt->getType()))
+
+        P0315Visitor dt{*this};
+        dt.TraverseType(stmt->getType());
+
         if(not mLambdaStack.empty()) {
             for(const auto& e : mLambdaStack) {
-                RETURN_IF(LambdaCallerType::VarDecl == e.callerType());
+                RETURN_IF((LambdaCallerType::MemberCallExpr == e.callerType()) and isa<DecltypeType>(stmt->getType()));
             }
         }
     }

tests/Issue492.cpp

@@ -0,0 +1,11 @@
+// cmdline:-std=c++20
+
+#include <queue>
+#include <vector>
+
+void f()
+{
+    std::priority_queue<int,
+                        std::vector<int>,
+                        decltype([](int lhs, int rhs) { return lhs > rhs; })> min_heap;
+}

tests/Issue492.expect

@@ -0,0 +1,36 @@
+// cmdline:-std=c++20
+
+#include <queue>
+#include <vector>
+
+void f()
+{
+
+  class __lambda_10_34
+  {
+    public: 
+    inline /*constexpr */ bool operator()(int lhs, int rhs) const
+    {
+      return lhs > rhs;
+    }
+
+    using retType_10_34 = bool (*)(int, int);
+    inline constexpr operator retType_10_34 () const noexcept
+    {
+      return __invoke;
+    };
+
+    private: 
+    static inline /*constexpr */ bool __invoke(int lhs, int rhs)
+    {
+      return __lambda_10_34{}.operator()(lhs, rhs);
+    }
+
+    public: 
+    // /*constexpr */ __lambda_10_34() = default;
+
+  };
+
+  std::priority_queue<int, std::vector<int, std::allocator<int> >, __lambda_10_34> min_heap = std::priority_queue<int, std::vector<int, std::allocator<int> >, __lambda_10_34>();
+}
+

tests/Issue492_2.cpp

@@ -0,0 +1,20 @@
+// cmdline:-std=c++20
+
+template<
+    class T,
+    class Container,
+    class _Compare
+> class priority_queue
+{
+    public:
+    priority_queue(){}
+};
+
+
+void f()
+{
+    priority_queue<int,
+                        float,
+                        decltype([]() { return false; })> min_heap;
+}
+

tests/Issue492_2.expect

@@ -0,0 +1,63 @@
+// cmdline:-std=c++20
+
+template<class T, class Container, class _Compare>
+class priority_queue
+{
+
+  public: 
+  inline priority_queue()
+  {
+  }
+
+};
+
+/* First instantiated from: Issue492_2.cpp:18 */
+#ifdef INSIGHTS_USE_TEMPLATE
+template<>
+class priority_queue<int, float, __lambda_18_34>
+{
+
+  public: 
+  inline priority_queue()
+  {
+  }
+
+};
+
+#endif
+
+
+
+void f()
+{
+
+  class __lambda_18_34
+  {
+    public: 
+    inline /*constexpr */ bool operator()() const
+    {
+      return false;
+    }
+
+    using retType_18_34 = bool (*)();
+    inline constexpr operator retType_18_34 () const noexcept
+    {
+      return __invoke;
+    };
+
+    private: 
+    static inline /*constexpr */ bool __invoke()
+    {
+      return __lambda_18_34{}.operator()();
+    }
+
+
+    public:
+    // /*constexpr */ __lambda_18_34() = default;
+
+  };
+
+  priority_queue<int, float, __lambda_18_34> min_heap = priority_queue<int, float, __lambda_18_34>();
+}
+
+