Fix memory leak

We can't have the ExpressionVariableReference/TemplateParameterReference
holding a Ptr of VariableDeclaration because the VariableDeclaration
holds a Ptr of them (in the references member) so they were referencing
eachother and the reference count never reaches 0.

Task-number: QTBUG-32745
Change-Id: I4cda6d9eccad123984f4ad35db3e56da01d4d5b1
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

6 files changed, 15 insertions, 15 deletions

diff --git a/src/xmlpatterns/expr/qexpressionvariablereference.cpp b/src/xmlpatterns/expr/qexpressionvariablereference.cpp
index c582629..d75e68c 100644
--- a/src/xmlpatterns/expr/qexpressionvariablereference.cpp
+++ b/src/xmlpatterns/expr/qexpressionvariablereference.cpp
@@ -39,8 +39,8 @@ QT_BEGIN_NAMESPACE
 using namespace QPatternist;
 
 ExpressionVariableReference::ExpressionVariableReference(const VariableSlotID slotP,
-                                                         const VariableDeclaration::Ptr &varDecl) : VariableReference(slotP)
-                                                                                                  , m_varDecl(varDecl)
+                                                         const VariableDeclaration *varDecl) : VariableReference(slotP)
+                                                                                             , m_varDecl(varDecl)
 {
 }
 
diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
index cc5645b..12a019c 100644
--- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
@@ -67,7 +67,7 @@ namespace QPatternist
     {
     public:
         ExpressionVariableReference(const VariableSlotID slot,
-                                    const VariableDeclaration::Ptr &varDecl);
+                                    const VariableDeclaration *varDecl);
 
         virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
         virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
@@ -80,9 +80,9 @@ namespace QPatternist
         virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
 
         inline const Expression::Ptr &sourceExpression() const;
-        inline const VariableDeclaration::Ptr &variableDeclaration() const;
+        inline const VariableDeclaration *variableDeclaration() const;
     private:
-        const VariableDeclaration::Ptr m_varDecl;
+        const VariableDeclaration *m_varDecl;
     };
 
     inline const Expression::Ptr &ExpressionVariableReference::sourceExpression() const
@@ -90,7 +90,7 @@ namespace QPatternist
         return m_varDecl->expression();
     }
 
-    inline const VariableDeclaration::Ptr &ExpressionVariableReference::variableDeclaration() const
+    inline const VariableDeclaration *ExpressionVariableReference::variableDeclaration() const
     {
         return m_varDecl;
     }
diff --git a/src/xmlpatterns/expr/qtemplateparameterreference.cpp b/src/xmlpatterns/expr/qtemplateparameterreference.cpp
index b2555a2..98808ab 100644
--- a/src/xmlpatterns/expr/qtemplateparameterreference.cpp
+++ b/src/xmlpatterns/expr/qtemplateparameterreference.cpp
@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 
 using namespace QPatternist;
 
-TemplateParameterReference::TemplateParameterReference(const VariableDeclaration::Ptr &varDecl) : m_varDecl(varDecl)
+TemplateParameterReference::TemplateParameterReference(const VariableDeclaration *varDecl) : m_varDecl(varDecl)
 {
 }
 
diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
index b4bd6ca..a81f391 100644
--- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h
+++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
@@ -61,7 +61,7 @@ namespace QPatternist
     class TemplateParameterReference : public EmptyContainer
     {
     public:
-        TemplateParameterReference(const VariableDeclaration::Ptr &varDecl);
+        TemplateParameterReference(const VariableDeclaration *varDecl);
 
         virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
         virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
@@ -72,10 +72,10 @@ namespace QPatternist
         virtual Properties properties() const;
 
         inline const Expression::Ptr &sourceExpression() const;
-        inline const VariableDeclaration::Ptr &variableDeclaration() const;
+        inline const VariableDeclaration *variableDeclaration() const;
 
     private:
-        const VariableDeclaration::Ptr m_varDecl;
+        const VariableDeclaration *m_varDecl;
     };
 
     inline const Expression::Ptr &TemplateParameterReference::sourceExpression() const
@@ -83,7 +83,7 @@ namespace QPatternist
         return m_varDecl->expression();
     }
 
-    inline const VariableDeclaration::Ptr &TemplateParameterReference::variableDeclaration() const
+    inline const VariableDeclaration *TemplateParameterReference::variableDeclaration() const
     {
         return m_varDecl;
     }
diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp
index 5497fb8..fe2c3bb 100644
--- a/src/xmlpatterns/parser/qquerytransformparser.cpp
+++ b/src/xmlpatterns/parser/qquerytransformparser.cpp
@@ -1086,7 +1086,7 @@ static Expression::Ptr resolveVariable(const QXmlName &name,
              * mechanism must. */
             case VariableDeclaration::ExpressionVariable:
             {
-                retval = create(new ExpressionVariableReference(var->slot, var), sourceLocator, parseInfo);
+                retval = create(new ExpressionVariableReference(var->slot, var.data()), sourceLocator, parseInfo);
                 break;
             }
             case VariableDeclaration::FunctionArgument:
@@ -1101,7 +1101,7 @@ static Expression::Ptr resolveVariable(const QXmlName &name,
             }
             case VariableDeclaration::TemplateParameter:
             {
-                retval = create(new TemplateParameterReference(var), sourceLocator, parseInfo);
+                retval = create(new TemplateParameterReference(var.data()), sourceLocator, parseInfo);
                 break;
             }
             case VariableDeclaration::ExternalVariable:
diff --git a/src/xmlpatterns/parser/querytransformparser.ypp b/src/xmlpatterns/parser/querytransformparser.ypp
index edd2823..0a0b11c 100644
--- a/src/xmlpatterns/parser/querytransformparser.ypp
+++ b/src/xmlpatterns/parser/querytransformparser.ypp
@@ -1015,7 +1015,7 @@ static Expression::Ptr resolveVariable(const QXmlName &name,
              * mechanism must. */
             case VariableDeclaration::ExpressionVariable:
             {
-                retval = create(new ExpressionVariableReference(var->slot, var), sourceLocator, parseInfo);
+                retval = create(new ExpressionVariableReference(var->slot, var.data()), sourceLocator, parseInfo);
                 break;
             }
             case VariableDeclaration::FunctionArgument:
@@ -1030,7 +1030,7 @@ static Expression::Ptr resolveVariable(const QXmlName &name,
             }
             case VariableDeclaration::TemplateParameter:
             {
-                retval = create(new TemplateParameterReference(var), sourceLocator, parseInfo);
+                retval = create(new TemplateParameterReference(var.data()), sourceLocator, parseInfo);
                 break;
             }
             case VariableDeclaration::ExternalVariable: