Various fixes; solves (almost) all of the test regressions that would be 
caused by enabling SemaInit.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51261 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 9288e02..b1b9996 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -908,14 +908,16 @@
   void CheckExplicitInitList(InitListExpr *IList, QualType &T,
                              unsigned &Index);
 
-  void CheckElementTypes(InitListExpr *IList, QualType &DeclType, 
-                         unsigned &Index);
+  void CheckListElementTypes(InitListExpr *IList, QualType &DeclType, 
+                             unsigned &Index);
+  void CheckSubElementType(InitListExpr *IList, QualType ElemType, 
+                           unsigned &Index);
   // FIXME: Does DeclType need to be a reference type?
   void CheckScalarType(InitListExpr *IList, QualType &DeclType, 
                        unsigned &Index);
   void CheckVectorType(InitListExpr *IList, QualType DeclType, unsigned &Index);
   void CheckStructUnionTypes(InitListExpr *IList, QualType DeclType, 
-                             unsigned &Index, bool topLevel = false);
+                             unsigned &Index);
   void CheckArrayType(InitListExpr *IList, QualType &DeclType, unsigned &Index);
   
   int numArrayElements(QualType DeclType);