Do not crash when performing VisitLValue on union types.

This fixes PR 2948.

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

diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp
index 7d60dec9b8094c3ad31f342a80b2915fc8992082..2a74311cd9677e5049bc3915510b58467cefafcc 100644 (file)
--- a/lib/Analysis/GRExprEngine.cpp
+++ b/lib/Analysis/GRExprEngine.cpp
@@ -457,9 +457,10 @@ void GRExprEngine::VisitLValue(Expr* Ex, NodeTy* Pred, NodeSet& Dst) {
       // can be used in a lvalue context.  We need to enhance our support
       // of such temporaries in both the environment and the store, so right
       // now we just do a regular visit.
-      assert (Ex->getType()->isAggregateType() && 
-              "Other kinds of expressions with non-aggregate types do not "
-              "have lvalues.");
+      assert ((Ex->getType()->isAggregateType() || 
+              Ex->getType()->isUnionType()) &&
+              "Other kinds of expressions with non-aggregate/union types do"
+              " not have lvalues.");
       
       Visit(Ex, Pred, Dst);
   }

diff --git a/test/Analysis/misc-ps.m b/test/Analysis/misc-ps.m
index f473f290c735e5cfd276dacad92a01574eecc001..0340c027cd213b336a15b61be3da66c350b6aab1 100644 (file)
--- a/test/Analysis/misc-ps.m
+++ b/test/Analysis/misc-ps.m
@@ -43,3 +43,16 @@ void divzeroassumeB(unsigned x, unsigned j) {
   if (j == 0) x = x / 0;  // no-warning
 }
 
+// PR 2948 (testcase; crash on VisitLValue for union types)
+// http://llvm.org/bugs/show_bug.cgi?id=2948
+
+void checkaccess_union() {
+  int ret = 0, status;
+  if (((((__extension__ (((union {
+    __typeof (status) __in; int __i;}
+    )
+    {
+      .__in = (status)}
+      ).__i))) & 0xff00) >> 8) == 1)
+        ret = 1;
+}