diff --git a/src/libs/cplusplus/ASTParent.cpp b/src/libs/cplusplus/ASTParent.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2217b3b133e9c05a3c4d87445eb802d4e341a532
--- /dev/null
+++ b/src/libs/cplusplus/ASTParent.cpp
@@ -0,0 +1,77 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+**
+**************************************************************************/
+
+#include "ASTParent.h"
+#include "AST.h"
+
+using namespace CPlusPlus;
+
+ASTParent::ASTParent(Control *control, AST *rootNode)
+    : ASTVisitor(control)
+{
+    accept(rootNode);
+}
+
+ASTParent::~ASTParent()
+{ }
+
+AST *ASTParent::operator()(AST *ast) const
+{ return parent(ast); }
+
+AST *ASTParent::parent(AST *ast) const
+{ return _parentMap.value(ast); }
+
+bool ASTParent::preVisit(AST *ast)
+{
+    if (! _parentStack.isEmpty())
+        _parentMap.insert(ast, _parentStack.top());
+
+    _parentStack.push(ast);
+
+    return true;
+}
+
+QList<AST *> ASTParent::path(AST *ast) const
+{
+    QList<AST *> path;
+    path_helper(ast, &path);
+    return path;
+}
+
+void ASTParent::path_helper(AST *ast, QList<AST *> *path) const
+{
+    if (! ast)
+        return;
+
+    path_helper(parent(ast), path);
+    path->append(ast);
+}
+
+void ASTParent::postVisit(AST *)
+{ _parentStack.pop(); }
diff --git a/src/libs/cplusplus/ASTParent.h b/src/libs/cplusplus/ASTParent.h
new file mode 100644
index 0000000000000000000000000000000000000000..b76c8c1d981ed58363fb65fd005cb995e1e0c891
--- /dev/null
+++ b/src/libs/cplusplus/ASTParent.h
@@ -0,0 +1,63 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+**
+**************************************************************************/
+
+#ifndef ASTPARENT_H
+#define ASTPARENT_H
+
+#include <ASTVisitor.h>
+#include <QtCore/QHash>
+#include <QtCore/QStack>
+
+namespace CPlusPlus {
+
+class CPLUSPLUS_EXPORT ASTParent: protected ASTVisitor
+{
+public:
+    ASTParent(Control *control, AST *rootNode);
+    virtual ~ASTParent();
+
+    AST *operator()(AST *ast) const;
+
+    AST *parent(AST *ast) const;
+    QList<AST *> path(AST *ast) const;
+
+protected:
+    virtual bool preVisit(AST *ast);
+    virtual void postVisit(AST *ast);
+
+    void path_helper(AST *ast, QList<AST *> *path) const;
+
+private:
+    QHash<AST *, AST *> _parentMap;
+    QStack<AST *> _parentStack;
+};
+
+} // namespace CPlusPlus
+
+#endif // ASTPARENT_H
diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index c5b0c3d6f3e4a2f2be582670b35c38da139aa265..f8b11fed82b0f9a5d322083a5247e93e15025a9e 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -27,6 +27,7 @@ HEADERS += \
     $$PWD/ResolveExpression.h \
     $$PWD/LookupContext.h \
     $$PWD/CppBindings.h \
+    $$PWD/ASTParent.h \
     $$PWD/PreprocessorClient.h \
     $$PWD/PreprocessorEnvironment.h \
     $$PWD/Macro.h \
@@ -47,6 +48,7 @@ SOURCES += \
     $$PWD/ResolveExpression.cpp \
     $$PWD/LookupContext.cpp \
     $$PWD/CppBindings.cpp \
+    $$PWD/ASTParent.cpp \
     $$PWD/PreprocessorClient.cpp \
     $$PWD/PreprocessorEnvironment.cpp \
     $$PWD/FastPreprocessor.cpp \