[cfe-dev] Fix the type of conditionals involving void*

[Eli Friedman]

>From PR1989.

Simplified testcase:
struct a; int a() {0 ? (void*)1 : 0 ? 0 : (struct a*)0;}

crashes with clang -emit-llvm.

Patch okay?

-Eli

Index: Sema/SemaExpr.cpp
===================================================================
--- Sema/SemaExpr.cpp   (revision 46873)
+++ Sema/SemaExpr.cpp   (working copy)
@@ -821,11 +831,22 @@
 
       // ignore qualifiers on void (C99 6.5.15p3, clause 6)
       if (lhptee->isVoidType() &&
-          (rhptee->isObjectType() || rhptee->isIncompleteType()))
-        return lexT;
+          (rhptee->isObjectType() || rhptee->isIncompleteType())) {
+        // figure out necessary qualifiers (C99 6.5.15p6)
+        QualType destPointee = lhptee.getQualifiedType(rhptee.getQualifiers());
+        QualType destType = Context.getPointerType(destPointee);
+        ImpCastExprToType(lex, destType); // add qualifiers if necessary
+        ImpCastExprToType(rex, destType); // promote to void*
+        return destType;
+      }
       if (rhptee->isVoidType() &&
-          (lhptee->isObjectType() || lhptee->isIncompleteType()))
-        return rexT;
+          (lhptee->isObjectType() || lhptee->isIncompleteType())) {
+        QualType destPointee = rhptee.getQualifiedType(lhptee.getQualifiers());
+        QualType destType = Context.getPointerType(destPointee);
+        ImpCastExprToType(lex, destType); // add qualifiers if necessary
+        ImpCastExprToType(rex, destType); // promote to void*
+        return destType;
+      }
 
       if (!Context.typesAreCompatible(lhptee.getUnqualifiedType(), 
                                       rhptee.getUnqualifiedType())) {
@@ -846,6 +867,7 @@
       // a pointer to an appropriately qualified version of the *composite*
       // type.
       // FIXME: Need to return the composite type.
+      // FIXME: Need to add qualifiers
       return lexT;
     }
   }

_______________________________________________
cfe-dev mailing list
cfe-dev@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev