Commit b0618281 authored by Erik Verbruggen's avatar Erik Verbruggen Committed by Erik Verbruggen

C++: Do type and name equality checking in a safe manner.

Change the TypeMatcher to also match names, and use two "block" lists
in SafeMatcher to prevent infinite recursion.

Task-number: QTCREATORBUG-11240
Change-Id: I0367ae795ee6be579b83aeb8d46723c877e4aa75
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent 186570a2
......@@ -49,7 +49,7 @@
#include "Token.h"
#include "TranslationUnit.h"
#include "Type.h"
#include "TypeMatcher.h"
#include "Matcher.h"
#include "TypeVisitor.h"
#include "Templates.h"
......
......@@ -82,7 +82,7 @@ class QualifiedNameId;
class SelectorNameId;
// types
class TypeMatcher;
class Matcher;
class FullySpecifiedType;
class TypeVisitor;
class Type;
......
......@@ -25,7 +25,6 @@
#include "CoreTypes.h"
#include "Symbols.h"
#include "Names.h"
#include "TypeMatcher.h"
#include <map>
#include <set>
#include <algorithm>
......@@ -479,8 +478,6 @@ public:
TranslationUnit *translationUnit;
DiagnosticClient *diagnosticClient;
TypeMatcher matcher;
LiteralTable<Identifier> identifiers;
LiteralTable<StringLiteral> stringLiterals;
LiteralTable<NumericLiteral> numericLiterals;
......
......@@ -20,7 +20,7 @@
#include "CoreTypes.h"
#include "TypeVisitor.h"
#include "TypeMatcher.h"
#include "Matcher.h"
#include "Names.h"
#include <algorithm>
......@@ -37,7 +37,7 @@ bool UndefinedType::isEqualTo(const Type *other) const
void UndefinedType::accept0(TypeVisitor *visitor)
{ visitor->visit(this); }
bool UndefinedType::matchType0(const Type *otherType, TypeMatcher *matcher) const
bool UndefinedType::match0(const Type *otherType, Matcher *matcher) const
{
if (const UndefinedType *otherUndefinedTy = otherType->asUndefinedType())
return matcher->match(this, otherUndefinedTy);
......@@ -54,7 +54,7 @@ bool VoidType::isEqualTo(const Type *other) const
void VoidType::accept0(TypeVisitor *visitor)
{ visitor->visit(this); }
bool VoidType::matchType0(const Type *otherType, TypeMatcher *matcher) const
bool VoidType::match0(const Type *otherType, Matcher *matcher) const
{
if (const VoidType *otherVoidTy = otherType->asVoidType())
return matcher->match(this, otherVoidTy);
......@@ -89,7 +89,7 @@ bool PointerToMemberType::isEqualTo(const Type *other) const
void PointerToMemberType::accept0(TypeVisitor *visitor)
{ visitor->visit(this); }
bool PointerToMemberType::matchType0(const Type *otherType, TypeMatcher *matcher) const
bool PointerToMemberType::match0(const Type *otherType, Matcher *matcher) const
{
if (const PointerToMemberType *otherTy = otherType->asPointerToMemberType())
return matcher->match(this, otherTy);
......@@ -115,7 +115,7 @@ bool PointerType::isEqualTo(const Type *other) const
void PointerType::accept0(TypeVisitor *visitor)
{ visitor->visit(this); }
bool PointerType::matchType0(const Type *otherType, TypeMatcher *matcher) const
bool PointerType::match0(const Type *otherType, Matcher *matcher) const
{
if (const PointerType *otherTy = otherType->asPointerType())
return matcher->match(this, otherTy);
......@@ -146,7 +146,7 @@ bool ReferenceType::isEqualTo(const Type *other) const
void ReferenceType::accept0(TypeVisitor *visitor)
{ visitor->visit(this); }
bool ReferenceType::matchType0(const Type *otherType, TypeMatcher *matcher) const
bool ReferenceType::match0(const Type *otherType, Matcher *matcher) const
{
if (const ReferenceType *otherTy = otherType->asReferenceType())
return matcher->match(this, otherTy);
......@@ -178,7 +178,7 @@ bool IntegerType::isEqualTo(const Type *other) const
void IntegerType::accept0(TypeVisitor *visitor)
{ visitor->visit(this); }
bool IntegerType::matchType0(const Type *otherType, TypeMatcher *matcher) const
bool IntegerType::match0(const Type *otherType, Matcher *matcher) const
{
if (const IntegerType *otherTy = otherType->asIntegerType())
return matcher->match(this, otherTy);
......@@ -199,7 +199,7 @@ FloatType::~FloatType()
void FloatType::accept0(TypeVisitor *visitor)
{ visitor->visit(this); }
bool FloatType::matchType0(const Type *otherType, TypeMatcher *matcher) const
bool FloatType::match0(const Type *otherType, Matcher *matcher) const
{
if (const FloatType *otherTy = otherType->asFloatType())
return matcher->match(this, otherTy);
......@@ -238,7 +238,7 @@ bool ArrayType::isEqualTo(const Type *other) const
void ArrayType::accept0(TypeVisitor *visitor)
{ visitor->visit(this); }
bool ArrayType::matchType0(const Type *otherType, TypeMatcher *matcher) const
bool ArrayType::match0(const Type *otherType, Matcher *matcher) const
{
if (const ArrayType *otherTy = otherType->asArrayType())
return matcher->match(this, otherTy);
......@@ -282,7 +282,7 @@ bool NamedType::isEqualTo(const Type *other) const
void NamedType::accept0(TypeVisitor *visitor)
{ visitor->visit(this); }
bool NamedType::matchType0(const Type *otherType, TypeMatcher *matcher) const
bool NamedType::match0(const Type *otherType, Matcher *matcher) const
{
if (const NamedType *otherTy = otherType->asNamedType())
return matcher->match(this, otherTy);
......
......@@ -46,7 +46,7 @@ public:
protected:
virtual void accept0(TypeVisitor *visitor);
virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const;
virtual bool match0(const Type *otherType, Matcher *matcher) const;
};
class CPLUSPLUS_EXPORT VoidType: public Type
......@@ -62,7 +62,7 @@ public:
protected:
virtual void accept0(TypeVisitor *visitor);
virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const;
virtual bool match0(const Type *otherType, Matcher *matcher) const;
};
class CPLUSPLUS_EXPORT IntegerType: public Type
......@@ -96,7 +96,7 @@ public:
protected:
virtual void accept0(TypeVisitor *visitor);
virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const;
virtual bool match0(const Type *otherType, Matcher *matcher) const;
private:
int _kind;
......@@ -127,7 +127,7 @@ public:
protected:
virtual void accept0(TypeVisitor *visitor);
virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const;
virtual bool match0(const Type *otherType, Matcher *matcher) const;
private:
int _kind;
......@@ -151,7 +151,7 @@ public:
protected:
virtual void accept0(TypeVisitor *visitor);
virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const;
virtual bool match0(const Type *otherType, Matcher *matcher) const;
private:
FullySpecifiedType _elementType;
......@@ -176,7 +176,7 @@ public:
protected:
virtual void accept0(TypeVisitor *visitor);
virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const;
virtual bool match0(const Type *otherType, Matcher *matcher) const;
private:
const Name *_memberName;
......@@ -202,7 +202,7 @@ public:
protected:
virtual void accept0(TypeVisitor *visitor);
virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const;
virtual bool match0(const Type *otherType, Matcher *matcher) const;
private:
FullySpecifiedType _elementType;
......@@ -228,7 +228,7 @@ public:
protected:
virtual void accept0(TypeVisitor *visitor);
virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const;
virtual bool match0(const Type *otherType, Matcher *matcher) const;
private:
FullySpecifiedType _elementType;
......@@ -253,7 +253,7 @@ public:
protected:
virtual void accept0(TypeVisitor *visitor);
virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const;
virtual bool match0(const Type *otherType, Matcher *matcher) const;
private:
const Name *_name;
......
......@@ -245,10 +245,10 @@ void FullySpecifiedType::copySpecifiers(const FullySpecifiedType &type)
f._isExplicit = type.f._isExplicit;
}
bool FullySpecifiedType::match(const FullySpecifiedType &otherTy, TypeMatcher *matcher) const
bool FullySpecifiedType::match(const FullySpecifiedType &otherTy, Matcher *matcher) const
{
if (_flags != otherTy._flags)
return false;
return type()->matchType(otherTy.type(), matcher);
return Type::match(type(), otherTy.type(), matcher);
}
......@@ -106,7 +106,7 @@ public:
bool operator != (const FullySpecifiedType &other) const;
bool operator < (const FullySpecifiedType &other) const;
bool match(const FullySpecifiedType &otherTy, TypeMatcher *matcher) const;
bool match(const FullySpecifiedType &otherTy, Matcher *matcher) const;
FullySpecifiedType simplified() const;
......
......@@ -20,6 +20,7 @@
#include "Literals.h"
#include "NameVisitor.h"
#include "Matcher.h"
#include <cstring>
#include <algorithm>
#include <iostream>
......@@ -200,6 +201,13 @@ Identifier::~Identifier()
void Identifier::accept0(NameVisitor *visitor) const
{ visitor->visit(this); }
bool Identifier::match0(const Name *otherName, Matcher *matcher) const
{
if (const Identifier *id = otherName->asNameId())
return matcher->match(this, id);
return false;
}
bool Identifier::isEqualTo(const Name *other) const
{
if (this == other)
......
......@@ -113,6 +113,7 @@ public:
protected:
virtual void accept0(NameVisitor *visitor) const;
virtual bool match0(const Name *otherName, Matcher *matcher) const;
};
} // namespace CPlusPlus
......
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** 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.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "Matcher.h"
#include "CoreTypes.h"
#include "Symbols.h"
#include "Names.h"
#include "Literals.h"
using namespace CPlusPlus;
Matcher::Matcher()
{
}
Matcher::~Matcher()
{
}
bool Matcher::match(const Type *type, const Type *otherType, Matcher *matcher)
{
if (type == otherType)
return true;
if (!type)
return false;
return type->match0(otherType, matcher);
}
bool Matcher::match(const Name *name, const Name *otherName, Matcher *matcher)
{
if (name == otherName)
return true;
if (!name || !otherName)
return false;
return name->match0(otherName, matcher);
}
bool Matcher::match(const UndefinedType *, const UndefinedType *)
{
return true;
}
bool Matcher::match(const VoidType *, const VoidType *)
{
return true;
}
bool Matcher::match(const IntegerType *type, const IntegerType *otherType)
{
if (type == otherType)
return true;
else if (type->kind() != otherType->kind())
return false;
return true;
}
bool Matcher::match(const FloatType *type, const FloatType *otherType)
{
if (type == otherType)
return true;
else if (type->kind() != otherType->kind())
return false;
return true;
}
bool Matcher::match(const PointerToMemberType *type, const PointerToMemberType *otherType)
{
if (type == otherType)
return true;
else if (! Name::match(type->memberName(), otherType->memberName(), this))
return false;
else if (! type->elementType().match(otherType->elementType(), this))
return false;
return true;
}
bool Matcher::match(const PointerType *type, const PointerType *otherType)
{
if (type == otherType)
return true;
else if (! type->elementType().match(otherType->elementType(), this))
return false;
return true;
}
bool Matcher::match(const ReferenceType *type, const ReferenceType *otherType)
{
if (type == otherType)
return true;
else if (type->isRvalueReference() != otherType->isRvalueReference())
return false;
else if (! type->elementType().match(otherType->elementType(), this))
return false;
return true;
}
bool Matcher::match(const ArrayType *type, const ArrayType *otherType)
{
if (type == otherType)
return true;
else if (type->size() != otherType->size())
return false;
else if (! type->elementType().match(otherType->elementType(), this))
return false;
return true;
}
bool Matcher::match(const NamedType *type, const NamedType *otherType)
{
if (type == otherType)
return true;
else if (! Name::match(type->name(), otherType->name(), this))
return false;
return true;
}
bool Matcher::match(const Function *type, const Function *otherType)
{
if (type != otherType)
return false;
return true;
}
bool Matcher::match(const Enum *type, const Enum *otherType)
{
if (type != otherType)
return false;
return true;
}
bool Matcher::match(const Namespace *type, const Namespace *otherType)
{
if (type != otherType)
return false;
return true;
}
bool Matcher::match(const Template *type, const Template *otherType)
{
if (type != otherType)
return false;
return true;
}
bool Matcher::match(const ForwardClassDeclaration *type, const ForwardClassDeclaration *otherType)
{
if (type != otherType)
return false;
return true;
}
bool Matcher::match(const Class *type, const Class *otherType)
{
if (type != otherType)
return false;
return true;
}
bool Matcher::match(const ObjCClass *type, const ObjCClass *otherType)
{
if (type != otherType)
return false;
return true;
}
bool Matcher::match(const ObjCProtocol *type, const ObjCProtocol *otherType)
{
if (type != otherType)
return false;
return true;
}
bool Matcher::match(const ObjCForwardClassDeclaration *type, const ObjCForwardClassDeclaration *otherType)
{
if (type != otherType)
return false;
return true;
}
bool Matcher::match(const ObjCForwardProtocolDeclaration *type, const ObjCForwardProtocolDeclaration *otherType)
{
if (type != otherType)
return false;
return true;
}
bool Matcher::match(const ObjCMethod *type, const ObjCMethod *otherType)
{
if (type != otherType)
return false;
return true;
}
bool Matcher::match(const Identifier *name, const Identifier *otherName)
{
if (name == otherName)
return true;
return name->equalTo(otherName);
}
bool Matcher::match(const AnonymousNameId *name, const AnonymousNameId *otherName)
{
return otherName && name->classTokenIndex() == otherName->classTokenIndex();
}
bool Matcher::match(const TemplateNameId *name, const TemplateNameId *otherName)
{
const Identifier *l = name->identifier();
const Identifier *r = otherName->identifier();
if (! match(l, r))
return false;
if (name->templateArgumentCount() != otherName->templateArgumentCount())
return false;
for (unsigned i = 0, ei = name->templateArgumentCount(); i != ei; ++i) {
const FullySpecifiedType &l = name->templateArgumentAt(i);
const FullySpecifiedType &r = otherName->templateArgumentAt(i);
if (! l.match(r, this))
return false;
}
return true;
}
bool Matcher::match(const DestructorNameId *name, const DestructorNameId *otherName)
{
return Name::match(name->name(), otherName->name(), this);
}
bool Matcher::match(const OperatorNameId *name, const OperatorNameId *otherName)
{
return name->kind() == otherName->kind();
}
bool Matcher::match(const ConversionNameId *name, const ConversionNameId *otherName)
{
return name->type().match(otherName->type(), this);
}
bool Matcher::match(const QualifiedNameId *name, const QualifiedNameId *otherName)
{
if (Name::match(name->base(), otherName->base(), this))
return Name::match(name->name(), otherName->name(), this);
return false;
}
bool Matcher::match(const SelectorNameId *name, const SelectorNameId *otherName)
{
const unsigned nc = name->nameCount();
if (name->hasArguments() != otherName->hasArguments() ||
nc != otherName->nameCount())
return false;
for (unsigned i = 0; i < nc; ++i)
if (!Name::match(name->nameAt(i), otherName->nameAt(i), this))
return false;
return true;
}
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** 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.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef TYPEMATCHER_H
#define TYPEMATCHER_H
......@@ -6,14 +34,17 @@
namespace CPlusPlus {
class CPLUSPLUS_EXPORT TypeMatcher
class CPLUSPLUS_EXPORT Matcher
{
TypeMatcher(const TypeMatcher &other);
void operator = (const TypeMatcher &other);
Matcher(const Matcher &other);
void operator = (const Matcher &other);
public:
TypeMatcher();
virtual ~TypeMatcher();
Matcher();
virtual ~Matcher();
static bool match(const Type *type, const Type *otherType, Matcher *matcher);
static bool match(const Name *name, const Name *otherName, Matcher *matcher);
virtual bool match(const Undefin