diff options
Diffstat (limited to 'clang/lib/AST')
| -rw-r--r-- | clang/lib/AST/ASTImporter.cpp | 7 | ||||
| -rw-r--r-- | clang/lib/AST/ExprCXX.cpp | 16 |
2 files changed, 4 insertions, 19 deletions
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp index 60f001009ac..05f96fd4328 100644 --- a/clang/lib/AST/ASTImporter.cpp +++ b/clang/lib/AST/ASTImporter.cpp @@ -5796,11 +5796,6 @@ Expr *ASTNodeImporter::VisitCXXConstructExpr(CXXConstructExpr *E) { if (T.isNull()) return nullptr; - NamedDecl *ToFound = - dyn_cast_or_null<NamedDecl>(Importer.Import(E->getFoundDecl())); - if (!ToFound) - return nullptr; - CXXConstructorDecl *ToCCD = dyn_cast_or_null<CXXConstructorDecl>(Importer.Import(E->getConstructor())); if (!ToCCD) @@ -5813,7 +5808,7 @@ Expr *ASTNodeImporter::VisitCXXConstructExpr(CXXConstructExpr *E) { return CXXConstructExpr::Create(Importer.getToContext(), T, Importer.Import(E->getLocation()), - ToFound, ToCCD, E->isElidable(), + ToCCD, E->isElidable(), ToArgs, E->hadMultipleCandidates(), E->isListInitialization(), E->isStdInitListInitialization(), diff --git a/clang/lib/AST/ExprCXX.cpp b/clang/lib/AST/ExprCXX.cpp index dbfe58c8b3d..09401b704e2 100644 --- a/clang/lib/AST/ExprCXX.cpp +++ b/clang/lib/AST/ExprCXX.cpp @@ -432,12 +432,6 @@ SourceLocation CXXConstructExpr::getLocEnd() const { return End; } -NamedDecl *CXXConstructExpr::getFoundDecl() const { - if (auto *Template = Constructor->getPrimaryTemplate()) - return Template; - return Constructor; -} - SourceRange CXXOperatorCallExpr::getSourceRangeImpl() const { OverloadedOperatorKind Kind = getOperator(); if (Kind == OO_PlusPlus || Kind == OO_MinusMinus) { @@ -723,7 +717,6 @@ CXXBindTemporaryExpr *CXXBindTemporaryExpr::Create(const ASTContext &C, } CXXTemporaryObjectExpr::CXXTemporaryObjectExpr(const ASTContext &C, - NamedDecl *Found, CXXConstructorDecl *Cons, TypeSourceInfo *Type, ArrayRef<Expr*> Args, @@ -735,7 +728,7 @@ CXXTemporaryObjectExpr::CXXTemporaryObjectExpr(const ASTContext &C, : CXXConstructExpr(C, CXXTemporaryObjectExprClass, Type->getType().getNonReferenceType(), Type->getTypeLoc().getBeginLoc(), - Found, Cons, false, Args, + Cons, false, Args, HadMultipleCandidates, ListInitialization, StdInitListInitialization, @@ -757,7 +750,6 @@ SourceLocation CXXTemporaryObjectExpr::getLocEnd() const { CXXConstructExpr *CXXConstructExpr::Create(const ASTContext &C, QualType T, SourceLocation Loc, - NamedDecl *Found, CXXConstructorDecl *Ctor, bool Elidable, ArrayRef<Expr*> Args, @@ -768,7 +760,7 @@ CXXConstructExpr *CXXConstructExpr::Create(const ASTContext &C, QualType T, ConstructionKind ConstructKind, SourceRange ParenOrBraceRange) { return new (C) CXXConstructExpr(C, CXXConstructExprClass, T, Loc, - Found, Ctor, Elidable, Args, + Ctor, Elidable, Args, HadMultipleCandidates, ListInitialization, StdInitListInitialization, ZeroInitialization, ConstructKind, @@ -777,7 +769,7 @@ CXXConstructExpr *CXXConstructExpr::Create(const ASTContext &C, QualType T, CXXConstructExpr::CXXConstructExpr(const ASTContext &C, StmtClass SC, QualType T, SourceLocation Loc, - NamedDecl *Found, CXXConstructorDecl *Ctor, + CXXConstructorDecl *Ctor, bool Elidable, ArrayRef<Expr*> Args, bool HadMultipleCandidates, @@ -798,8 +790,6 @@ CXXConstructExpr::CXXConstructExpr(const ASTContext &C, StmtClass SC, ZeroInitialization(ZeroInitialization), ConstructKind(ConstructKind), Args(nullptr) { - assert(declaresSameEntity(Found, Ctor) || - declaresSameEntity(Found, Ctor->getPrimaryTemplate())); if (NumArgs) { this->Args = new (C) Stmt*[Args.size()]; |
