From: Richard Stallman <rms@gnu.org>
Date: Fri, 21 Aug 1992 20:48:11 +0000 (+0000)
Subject: (build_conditional_expr):
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=48c730637d496148bf06e89b144ebeb494d3d9ad;p=gcc.git

(build_conditional_expr):

Use TREE_READONLY and TREE_THIS_VOLATILE, not TYPE_...

From-SVN: r1929
---

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 6a52b41c7a5..9f23a9a0142 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -3545,8 +3545,8 @@ build_conditional_expr (ifexp, op1, op2)
   /* Merge const and volatile flags of the incoming types.  */
   result_type
     = build_type_variant (result_type,
-			  TYPE_READONLY (op1) || TYPE_READONLY (op2),
-			  TYPE_VOLATILE (op1) || TYPE_VOLATILE (op2));
+			  TREE_READONLY (op1) || TREE_READONLY (op2),
+			  TREE_THIS_VOLATILE (op1) || TREE_THIS_VOLATILE (op2));
     
   if (result_type != TREE_TYPE (op1))
     op1 = convert (result_type, op1);