From: Jason Merrill <merrill@gnu.org>
Date: Mon, 9 Jun 1997 23:41:21 +0000 (+0000)
Subject: x
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=88a5cdb87fee7f87987acd4863ecac2492b06d44;p=gcc.git

x

From-SVN: r14210
---

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 45311c91ed3..e8ef497176f 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;
 		}
 	    }