From: Richard Stallman <rms@gnu.org>
Date: Tue, 28 Jul 1992 02:15:51 +0000 (+0000)
Subject: (build_conditional_expr): Compare using TYPE_MAIN_VARIANT.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ad409d2e1b2205f167efd8eed56e5275f707c13;p=gcc.git

(build_conditional_expr): Compare using TYPE_MAIN_VARIANT.

From-SVN: r1695
---

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index ec984d48d07..ac8e48e3a1b 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -3454,8 +3454,13 @@ build_conditional_expr (ifexp, op1, op2)
       
   /* Quickly detect the usual case where op1 and op2 have the same type
      after promotion.  */
-  if (type1 == type2)
-    result_type = type1;
+  if (TYPE_MAIN_VARIANT (type1) == TYPE_MAIN_VARIANT (type2))
+    {
+      if (type1 == type2)
+	result_type = type1;
+      else
+	result_type = TYPE_MAIN_VARIANT (type1);
+    }
   else if ((code1 == INTEGER_TYPE || code1 == REAL_TYPE)
            && (code2 == INTEGER_TYPE || code2 == REAL_TYPE))
     {