Fix codegen for conditionals with incommpatible pointer types.  Code 
that causes this isn't really correct, but if we're going to accept 
this, it should come up with a consistent AST.

llvm-svn: 46557
diff --git a/clang/test/CodeGen/conditional.c b/clang/test/CodeGen/conditional.c
index 15359e0..24a5aca 100644
--- a/clang/test/CodeGen/conditional.c
+++ b/clang/test/CodeGen/conditional.c
@@ -15,3 +15,7 @@
    1 ? f() : (void)0;
 }
 
+void test4() {
+int i; short j;
+float* k = 1 ? &i : &j;
+}