commit 6fcf2ca844e28bcec97b7f0ee77810b7b93b98ad
author Douglas Gregor <doug.gregor@gmail.com> Sat May 02 00:36:19 2009 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Sat May 02 00:36:19 2009 +0000
tree ae74f5d1bb489d407e48b3baf9bf3ded06d83066
parent 2504e8bbe0842e1e2c137b7e891543a5f4833106

Fix bitfield promotions in several more cases. We don't seem to work hard enough at determining whether an expression is a bitfield or not, yet.

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

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 3442cc1..47b9fbd 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -264,6 +264,14 @@
   if (!lhs->isArithmeticType() || !rhs->isArithmeticType())
     return lhs;
 
+  // Perform bitfield promotions.
+  QualType LHSBitfieldPromoteTy = isPromotableBitField(lhsExpr, Context);
+  if (!LHSBitfieldPromoteTy.isNull())
+    lhs = LHSBitfieldPromoteTy;
+  QualType RHSBitfieldPromoteTy = isPromotableBitField(rhsExpr, Context);
+  if (!RHSBitfieldPromoteTy.isNull())
+    rhs = RHSBitfieldPromoteTy;
+
   QualType destType = UsualArithmeticConversionsType(lhs, rhs);
   if (!isCompAssign)
     ImpCastExprToType(lhsExpr, destType);
@@ -3475,6 +3483,12 @@
         QualType LHSTy = lex->getType();
         if (LHSTy->isPromotableIntegerType())
           LHSTy = Context.IntTy;
+        else {
+          QualType T = isPromotableBitField(lex, Context);
+          if (!T.isNull())
+            LHSTy = T;
+        }
+
         *CompLHSTy = LHSTy;
       }
       return PExp->getType();
@@ -3628,8 +3642,11 @@
   QualType LHSTy;
   if (lex->getType()->isPromotableIntegerType())
     LHSTy = Context.IntTy;
-  else
-    LHSTy = lex->getType();
+  else {
+    LHSTy = isPromotableBitField(lex, Context);
+    if (LHSTy.isNull())
+      LHSTy = lex->getType();
+  }
   if (!isCompAssign)
     ImpCastExprToType(lex, LHSTy);
 
@@ -4067,7 +4084,7 @@
   // C99 6.5.16.1p2: In simple assignment, the value of the right operand
   // is converted to the type of the assignment expression (above).
   // C++ 5.17p1: the type of the assignment expression is that of its left
-  // oprdu.
+  // operand.
   return LHSType.getUnqualifiedType();
 }