summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST/ASTImporter.cpp
diff options
context:
space:
mode:
authorGabor Marton <martongabesz@gmail.com>2019-02-15 12:04:05 +0000
committerGabor Marton <martongabesz@gmail.com>2019-02-15 12:04:05 +0000
commit302f300a7a705e0bf27ee1987ec263b929ee92a5 (patch)
tree4b2b5c3235246ace7202493d6776ebbcae5a0915 /clang/lib/AST/ASTImporter.cpp
parent0b53e8454b11340353610162191edb8eccd775cd (diff)
downloadbcm5719-llvm-302f300a7a705e0bf27ee1987ec263b929ee92a5.tar.gz
bcm5719-llvm-302f300a7a705e0bf27ee1987ec263b929ee92a5.zip
[ASTImporter] Import every Decl in lambda record
Summary: Previously only the fields were imported. Now every Decl is imported. This way the destructor decl is not missing after import. Patch by balazske (Balázs Kéri) Reviewers: a.sidorin, shafik Reviewed By: shafik Subscribers: balazske, cfe-commits, Szelethus, martong, dkrupp Tags: #clang Differential Revision: https://reviews.llvm.org/D57740 llvm-svn: 354120
Diffstat (limited to 'clang/lib/AST/ASTImporter.cpp')
-rw-r--r--clang/lib/AST/ASTImporter.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp
index c8fc6a44b92..c64a6d17070 100644
--- a/clang/lib/AST/ASTImporter.cpp
+++ b/clang/lib/AST/ASTImporter.cpp
@@ -7393,13 +7393,9 @@ ExpectedStmt ASTNodeImporter::VisitLambdaExpr(LambdaExpr *E) {
// NOTE: lambda classes are created with BeingDefined flag set up.
// It means that ImportDefinition doesn't work for them and we should fill it
// manually.
- if (ToClass->isBeingDefined()) {
- for (auto FromField : FromClass->fields()) {
- auto ToFieldOrErr = import(FromField);
- if (!ToFieldOrErr)
- return ToFieldOrErr.takeError();
- }
- }
+ if (ToClass->isBeingDefined())
+ if (Error Err = ImportDeclContext(FromClass, /*ForceImport = */ true))
+ return std::move(Err);
auto ToCallOpOrErr = import(E->getCallOperator());
if (!ToCallOpOrErr)
OpenPOWER on IntegriCloud