diff options
| author | Shafik Yaghmour <syaghmour@apple.com> | 2019-04-08 20:50:21 +0000 |
|---|---|---|
| committer | Shafik Yaghmour <syaghmour@apple.com> | 2019-04-08 20:50:21 +0000 |
| commit | d4263123abfc4876a1b722a1130dcf6aebff0580 (patch) | |
| tree | d36dba9fcd24124f376621c7e185cebe7442cde0 /clang | |
| parent | bf1417d7e4fd6c20e7babb45a4492e741a7b19b5 (diff) | |
| download | bcm5719-llvm-d4263123abfc4876a1b722a1130dcf6aebff0580.tar.gz bcm5719-llvm-d4263123abfc4876a1b722a1130dcf6aebff0580.zip | |
[ASTImporter] Call to HandleNameConflict in VisitEnumDecl mistakeningly using Name instead of SearchName
Summary:
https://reviews.llvm.org/D51633 added error handling to the ASTNodeImporter::VisitEnumDecl(...) for the conflicting names case. This could lead to erroneous return of an error in that case since we should have been using SearchName. Name may be empty in the case where we find the name via getTypedefNameForAnonDecl(...).
Differential Revision: https://reviews.llvm.org/D59665
llvm-svn: 357940
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/AST/ASTImporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp index e7f23cfe8fe..f6e25dd8a2a 100644 --- a/clang/lib/AST/ASTImporter.cpp +++ b/clang/lib/AST/ASTImporter.cpp @@ -2441,7 +2441,7 @@ ExpectedDecl ASTNodeImporter::VisitEnumDecl(EnumDecl *D) { } if (!ConflictingDecls.empty()) { - Name = Importer.HandleNameConflict(Name, DC, IDNS, + Name = Importer.HandleNameConflict(SearchName, DC, IDNS, ConflictingDecls.data(), ConflictingDecls.size()); if (!Name) |
