From 0bca59d6f7a2259b7eddefaeb19fcec8e60f37db Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Mon, 1 Jul 2013 06:08:20 +0000 Subject: [PATCH] PR16502: Fix a dumb bug where we might look past the last initializer in an InitListExpr. llvm-svn: 185304 --- clang/lib/Sema/SemaInit.cpp | 2 ++ clang/test/SemaCXX/decl-init-ref.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index f59571a48659..18328553d386 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -5346,6 +5346,8 @@ static void performLifetimeExtension(Expr *Init, const ValueDecl *ExtendingD) { for (RecordDecl::field_iterator I = RD->field_begin(), E = RD->field_end(); I != E; ++I) { + if (Index >= ILE->getNumInits()) + break; if (I->isUnnamedBitfield()) continue; Expr *SubInit = ILE->getInit(Index); diff --git a/clang/test/SemaCXX/decl-init-ref.cpp b/clang/test/SemaCXX/decl-init-ref.cpp index 6802e0c52c59..2d0c9cb4ffbe 100644 --- a/clang/test/SemaCXX/decl-init-ref.cpp +++ b/clang/test/SemaCXX/decl-init-ref.cpp @@ -30,3 +30,9 @@ PR6139 x = {{A()}}; // expected-error{{non-const lvalue reference to type 'A [1] struct PR6139b { A (&x)[1]; }; PR6139b y = {A()}; // expected-error{{non-const lvalue reference to type 'A [1]' cannot bind to a temporary of type 'A'}} + +namespace PR16502 { + struct A { int &&temporary; int x, y; }; + int f(); + const A &c = { 10, ++c.temporary }; +}