diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8d2ab78a21408166a86c3d72814d2569cfcdad90..eb52015cab77de5c72bc08067729697a4d7ebc57 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2005-11-02  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/22434
+	* call.c (build_conditional_expr): Do bad conversions, if there's
+	no other choice.
+
 	PR c++/24560
 	* parser.c (cp_parser_postfix_dot_deref_expression): Improve error
 	message for use of overloaded functions on LHS of "." operator.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 77cbe2a5ae5171312a79b159fb8d329e6be5cca6..99b8bcbee1556fd1dd76dbef71a23c4b5996e93d 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -3281,13 +3281,13 @@ build_conditional_expr (tree arg1, tree arg2, tree arg3)
 	  error ("operands to ?: have different types");
 	  result = error_mark_node;
 	}
-      else if (conv2 && !conv2->bad_p)
+      else if (conv2 && (!conv2->bad_p || !conv3))
 	{
 	  arg2 = convert_like (conv2, arg2);
 	  arg2 = convert_from_reference (arg2);
 	  arg2_type = TREE_TYPE (arg2);
 	}
-      else if (conv3 && !conv3->bad_p)
+      else if (conv3 && (!conv3->bad_p || !conv2))
 	{
 	  arg3 = convert_like (conv3, arg3);
 	  arg3 = convert_from_reference (arg3);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e71f25cbdc8d01be26f5dcd0cfaf0e366aab54c2..b52603ba2ccfb82e7a400b4c586fcb84016b1529 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-02  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/22434
+	* g++.dg/expr/cond8.C: New test.
+
 	PR c++/24560
 	* g++.dg/parse/dot1.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/expr/cond8.C b/gcc/testsuite/g++.dg/expr/cond8.C
new file mode 100644
index 0000000000000000000000000000000000000000..f05c81a26ce7bb30e2a7422e9a09d1b615eb56bc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/expr/cond8.C
@@ -0,0 +1,13 @@
+// PR c++/22434
+// { dg-options "" }
+
+struct A
+{
+  A(void*);
+  ~A();
+};
+
+void foo(const int i, bool b)
+{
+  b ? A(0) : i; // { dg-error "conversion|initializing" } 
+}