[PATCH] D59692: [ASTImporter] Fix name conflict handling with different strategies

labath added a comment. In D59692#1646990 , @martong wrote: > Jenkins is not green > http://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/743/ > However, the newly failing test is `TestTargetCommand.py`, which seems to be > unrelated. That ought

[PATCH] D59692: [ASTImporter] Fix name conflict handling with different strategies

martong added a comment. Jenkins is not green http://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/743/ However, the newly failing test is `TestTargetCommand.py`, which seems to be unrelated. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION

[PATCH] D59692: [ASTImporter] Fix name conflict handling with different strategies

This revision was automatically updated to reflect the committed changes. Closed by commit rGf035b75d8f07: [ASTImporter] Fix name conflict handling with different strategies (authored by martong). Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION

[PATCH] D59692: [ASTImporter] Fix name conflict handling with different strategies

martong updated this revision to Diff 217337. martong added a comment. - Apply clang-format Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D59692/new/ https://reviews.llvm.org/D59692 Files: clang/include/clang/AST/ASTImporter.h

[PATCH] D59692: [ASTImporter] Fix name conflict handling with different strategies

martong updated this revision to Diff 217330. martong marked 2 inline comments as done. martong added a comment. - Revert changes in VisitFieldDecl and in VisitIndirectFieldDecl - Remove test suite ConflictingDeclsWithConservativeStrategy Repository: rG LLVM Github Monorepo CHANGES SINCE

[PATCH] D59692: [ASTImporter] Fix name conflict handling with different strategies

martong marked 4 inline comments as done. martong added inline comments. Comment at: clang/lib/AST/ASTImporter.cpp:3452 << FoundField->getType(); - - return make_error(ImportError::NameConflict); + ConflictingDecls.push_back(FoundField); }

[PATCH] D59692: [ASTImporter] Fix name conflict handling with different strategies

shafik accepted this revision. shafik added a comment. Other than my two comment this LGTM Comment at: clang/lib/AST/ASTImporter.cpp:3452 << FoundField->getType(); - - return make_error(ImportError::NameConflict); + ConflictingDecls.push_back(FoundField);

[PATCH] D59692: [ASTImporter] Fix name conflict handling with different strategies

martong added a comment. @shafik I have updated the patch with ODR handling strategies as per our discusson. For the record I copy our discussion here: On Sat, Aug 24, 2019 at 12:50 AM Shafik Yaghmour wrote: > Apologies, I missed this earlier! > > On Wed, Aug 21, 2019 at 2:44 AM Gábor