From 3bbb73169af5430ee45180feb43f209948e47d2a Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sat, 3 Oct 1998 15:56:25 +0000 Subject: [PATCH] typeck.c (build_conditional_expr): Only fold if ifexp is an INTEGER_CST. * typeck.c (build_conditional_expr): Only fold if ifexp is an INTEGER_CST. From-SVN: r22794 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/typeck.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 23ae3695015..1c26ef639a0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 1998-10-03 Jason Merrill + * typeck.c (build_conditional_expr): Only fold if ifexp is an + INTEGER_CST. + * decl2.c (finish_vtable_vardecl): Check DECL_INTERFACE_KNOWN instead of linkage. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index a3c75d94337..40b5b7e76fb 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5345,7 +5345,7 @@ build_conditional_expr (ifexp, op1, op2) op2 = convert_for_initialization (NULL_TREE, result_type, op2, LOOKUP_NORMAL, "converting", NULL_TREE, 0); - if (TREE_CONSTANT (ifexp)) + if (TREE_CODE (ifexp) == INTEGER_CST) return integer_zerop (ifexp) ? op2 : op1; return convert_from_reference