diff options
| author | Richard Stallman <rms@gnu.org> | 1992-08-21 20:48:11 +0000 |
|---|---|---|
| committer | Richard Stallman <rms@gnu.org> | 1992-08-21 20:48:11 +0000 |
| commit | 48c730637d496148bf06e89b144ebeb494d3d9ad (patch) | |
| tree | cf3f1c8f71f3e2b4cc8ffb08d68487227a65abd9 | |
| parent | d3b9996a9873aede974b52497fad10fc8fad9b85 (diff) | |
| download | gcc-48c730637d496148bf06e89b144ebeb494d3d9ad.zip gcc-48c730637d496148bf06e89b144ebeb494d3d9ad.tar.gz gcc-48c730637d496148bf06e89b144ebeb494d3d9ad.tar.bz2 | |
(build_conditional_expr):
Use TREE_READONLY and TREE_THIS_VOLATILE, not TYPE_...
From-SVN: r1929
| -rw-r--r-- | gcc/c-typeck.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index 6a52b41..9f23a9a 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); |