(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 6a52b41c7a520a0fd0c6e43620724dd9f734d4f2..9f23a9a0142322ed42c93d04951116fe591a9a4d 100644 (file)
--- 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);