aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <merrill@gnu.org>1997-06-09 23:41:21 +0000
committerJason Merrill <merrill@gnu.org>1997-06-09 23:41:21 +0000
commit88a5cdb87fee7f87987acd4863ecac2492b06d44 (patch)
treee6d725468f483644f0e4e3f2281f31a3e5cecda9
parenta112a4d6ac4345b2f2ba14e683329fa571ef4144 (diff)
downloadgcc-88a5cdb87fee7f87987acd4863ecac2492b06d44.zip
gcc-88a5cdb87fee7f87987acd4863ecac2492b06d44.tar.gz
gcc-88a5cdb87fee7f87987acd4863ecac2492b06d44.tar.bz2
x
From-SVN: r14210
-rw-r--r--gcc/fold-const.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 45311c9..e8ef497 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -5498,14 +5498,21 @@ fold (expr)
return pedantic_non_lvalue (convert (type, arg1));
case LE_EXPR:
case LT_EXPR:
- return pedantic_non_lvalue
- (convert (type, (fold (build (MIN_EXPR, comp_type,
- comp_op0, comp_op1)))));
+ /* In C++ a ?: expression can be an lvalue, so we can't
+ do this; we would lose the distinction between
+ LT and LE. */
+ if (pedantic_lvalues)
+ return pedantic_non_lvalue
+ (convert (type, (fold (build (MIN_EXPR, comp_type,
+ comp_op0, comp_op1)))));
+ break;
case GE_EXPR:
case GT_EXPR:
- return pedantic_non_lvalue
- (convert (type, fold (build (MAX_EXPR, comp_type,
- comp_op0, comp_op1))));
+ if (pedantic_lvalues)
+ return pedantic_non_lvalue
+ (convert (type, fold (build (MAX_EXPR, comp_type,
+ comp_op0, comp_op1))));
+ break;
}
}