From d8d7a374377571f2f8bc091a4bdeb2ed80258360 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Mon, 26 Sep 2011 19:09:09 +0000 Subject: CheckStringInit has side effects; make sure we don't run it in VerifyOnly mode, at least for the moment. . Sebastian, please take a look at this; I'm not entirely sure it is the right thing to do. llvm-svn: 140552 --- clang/lib/Sema/SemaInit.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'clang/lib/Sema/SemaInit.cpp') diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 9257b81335e..0c518c7bda1 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -744,8 +744,10 @@ void InitListChecker::CheckSubElementType(const InitializedEntity &Entity, // type here, though. if (Expr *Str = IsStringInit(expr, arrayType, SemaRef.Context)) { - CheckStringInit(Str, ElemType, arrayType, SemaRef); - UpdateStructuredListElement(StructuredList, StructuredIndex, Str); + if (!VerifyOnly) { + CheckStringInit(Str, ElemType, arrayType, SemaRef); + UpdateStructuredListElement(StructuredList, StructuredIndex, Str); + } ++Index; return; } @@ -1116,13 +1118,13 @@ void InitListChecker::CheckArrayType(const InitializedEntity &Entity, if (Index < IList->getNumInits()) { if (Expr *Str = IsStringInit(IList->getInit(Index), arrayType, SemaRef.Context)) { - CheckStringInit(Str, DeclType, arrayType, SemaRef); // We place the string literal directly into the resulting // initializer list. This is the only place where the structure // of the structured initializer list doesn't match exactly, // because doing so would involve allocating one character // constant for each string. if (!VerifyOnly) { + CheckStringInit(Str, DeclType, arrayType, SemaRef); UpdateStructuredListElement(StructuredList, StructuredIndex, Str); StructuredList->resizeInits(SemaRef.Context, StructuredIndex); } -- cgit v1.2.3