commit e6a8c9bf9c09ff6528ede8d0c472f3a12431cdb9
author Steve Naroff <snaroff@apple.com> Tue Sep 04 14:36:54 2007 +0000
committer Steve Naroff <snaroff@apple.com> Tue Sep 04 14:36:54 2007 +0000
tree b708c6fce654a49c0bba193f668f5647196a5b47
parent 2b8f121267dbc6c692b308cae457e5e8f9264cea

Make sure initializer type promotions get propagated.

This fixes a recent regression with Codegen/mandel.c.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41696 91177308-0d34-0410-b5e6-96231b3b80d8

Sema/SemaDecl.cpp

diff --git a/Sema/SemaDecl.cpp b/Sema/SemaDecl.cpp
index a1ef816..b178e09 100644
--- a/Sema/SemaDecl.cpp
+++ b/Sema/SemaDecl.cpp
@@ -239,7 +239,7 @@
   return 0;
 }
 
-bool Sema::CheckSingleInitializer(Expr *Init, QualType DeclType) {
+bool Sema::CheckSingleInitializer(Expr *&Init, QualType DeclType) {
   AssignmentCheckResult result;
   SourceLocation loc = Init->getLocStart();
   // Get the type before calling CheckSingleAssignmentConstraints(), since
@@ -289,8 +289,10 @@
   return false;
 }
 
-bool Sema::CheckInitExpr(Expr *expr, bool isStatic, QualType ElementType) {
+bool Sema::CheckInitExpr(Expr *expr, InitListExpr *IList, unsigned slot,
+                         bool isStatic, QualType ElementType) {
   SourceLocation loc;
+  Expr *savExpr = expr; // Might be promoted by CheckSingleInitializer.
 
   if (isStatic && !expr->isConstantExpr(Context, &loc)) { // C99 6.7.8p4.
     Diag(loc, diag::err_init_element_not_constant, expr->getSourceRange());
@@ -298,6 +300,8 @@
   } else if (CheckSingleInitializer(expr, ElementType)) {
     return true; // types weren't compatible.
   }
+  if (savExpr != expr) // The type was promoted, update initializer list.
+    IList->setInit(slot, expr);
   return false;
 }
 
@@ -322,7 +326,7 @@
                               maxElements, hadError);
       }
     } else {
-      hadError = CheckInitExpr(expr, isStatic, ElementType);
+      hadError = CheckInitExpr(expr, IList, i, isStatic, ElementType);
     }
     nInitializers++;
   }
@@ -366,7 +370,7 @@
         CheckConstantInitList(DeclType, InitList, ElementType, isStatic, 
                               totalInits, hadError);
       } else {
-        hadError = CheckInitExpr(expr, isStatic, ElementType);
+        hadError = CheckInitExpr(expr, IList, i, isStatic, ElementType);
         nInitsAtLevel++; // increment the number of initializers at this level.
         totalInits--;    // decrement the total number of initializers.
         
@@ -388,7 +392,7 @@
   return;
 }
 
-bool Sema::CheckInitializer(Expr *Init, QualType &DeclType, bool isStatic) {
+bool Sema::CheckInitializer(Expr *&Init, QualType &DeclType, bool isStatic) {
   InitListExpr *InitList = dyn_cast<InitListExpr>(Init);
   if (!InitList)
     return CheckSingleInitializer(Init, DeclType);