maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Be more careful when checking initializer lists that involve reference 

types; we don't want to give an expression reference type. Fixes PR6177.

llvm-svn: 95635
This commit is contained in:
Douglas Gregor 2010-02-09 00:50:06 +00:00
parent d00faaa9c7
commit 34c0a90265
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Sema/SemaInit.cpp
View File

@ -510,8 +510,8 @@ void InitListChecker::CheckExplicitInitList(const InitializedEntity &Entity,
StructuredList->setSyntacticForm(IList);
CheckListElementTypes(Entity, IList, T, /*SubobjectIsDesignatorContext=*/true,
Index, StructuredList, StructuredIndex, TopLevelObject);
IList->setType(T);
StructuredList->setType(T);
IList->setType(T.getNonReferenceType());
StructuredList->setType(T.getNonReferenceType());
if (hadError)
return;
@ -1672,7 +1672,7 @@ InitListChecker::getStructuredSubobjectInit(InitListExpr *IList, unsigned Index,
= new (SemaRef.Context) InitListExpr(InitRange.getBegin(), 0, 0,
InitRange.getEnd());
Result->setType(CurrentObjectType);
Result->setType(CurrentObjectType.getNonReferenceType());
// Pre-allocate storage for the structured initializer list.
unsigned NumElements = 0;

3
clang/test/SemaCXX/decl-init-ref.cpp
View File

@ -24,3 +24,6 @@ int main() {
const A& rca = f(); // expected-error {{reference initialization of type 'struct A const &' with initializer of type 'class B' is ambiguous}}
A& ra = f(); // expected-error {{non-const lvalue reference to type 'struct A' cannot bind to a temporary of type 'class B'}}
}
struct PR6177 { A (&x)[1]; };
PR6177 x = {{A()}}; // expected-error{{non-const lvalue reference to type 'struct A [1]' cannot bind to a temporary of type 'struct A'}}