diff options
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 15 | ||||
| -rw-r--r-- | clang/test/SemaCXX/pr27047-default-init-expr-name-conflict.cpp | 8 |
2 files changed, 21 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 40be8d64562..21db3be3ccf 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -11412,8 +11412,19 @@ ExprResult Sema::BuildCXXDefaultInitExpr(SourceLocation Loc, FieldDecl *Field) { CXXRecordDecl *ClassPattern = ParentRD->getTemplateInstantiationPattern(); DeclContext::lookup_result Lookup = ClassPattern->lookup(Field->getDeclName()); - assert(Lookup.size() == 1); - FieldDecl *Pattern = cast<FieldDecl>(Lookup[0]); + + // Lookup can return at most two results: the pattern for the field, or the + // injected class name of the parent record. No other member can have the + // same name as the field. + assert(!Lookup.empty() && Lookup.size() <= 2 && + "more than two lookup results for field name"); + FieldDecl *Pattern = dyn_cast<FieldDecl>(Lookup[0]); + if (!Pattern) { + assert(isa<CXXRecordDecl>(Lookup[0]) && + "cannot have other non-field member with same name"); + Pattern = cast<FieldDecl>(Lookup[1]); + } + if (InstantiateInClassInitializer(Loc, Field, Pattern, getTemplateInstantiationArgs(Field))) return ExprError(); diff --git a/clang/test/SemaCXX/pr27047-default-init-expr-name-conflict.cpp b/clang/test/SemaCXX/pr27047-default-init-expr-name-conflict.cpp new file mode 100644 index 00000000000..772db9935c0 --- /dev/null +++ b/clang/test/SemaCXX/pr27047-default-init-expr-name-conflict.cpp @@ -0,0 +1,8 @@ +// RUN: %clang_cc1 -fsyntax-only -std=c++11 %s + +template <typename T> +struct A { + // Used to crash when field was named after class. + int A = 0; +}; +A<int> a; |
