aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Sayle <roger@eyesopen.com>2004-04-20 02:52:17 +0000
committerRoger Sayle <sayle@gcc.gnu.org>2004-04-20 02:52:17 +0000
commit60c90ad15839985578b6731b0bfb36258cd16889 (patch)
tree98800796caec019d63ae98c02488d90a49c8e754
parent423c11897f8ba3d5ebac1e3c09d42c6b6a95e2fe (diff)
downloadgcc-60c90ad15839985578b6731b0bfb36258cd16889.zip
gcc-60c90ad15839985578b6731b0bfb36258cd16889.tar.gz
gcc-60c90ad15839985578b6731b0bfb36258cd16889.tar.bz2
re PR middle-end/14531 (pessimise code, loose constantness)
PR middle-end/14531 * class.c (build_base_path): Call fold whilst building the NULL pointer check expression trees. From-SVN: r80877
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/class.c9
2 files changed, 11 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a3a2c6a..2d691dc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-19 Roger Sayle <roger@eyesopen.com>
+
+ PR middle-end/14531
+ * class.c (build_base_path): Call fold whilst building the NULL
+ pointer check expression trees.
+
2004-04-15 Bryce McKinlay <mckinlay@redhat.com>
* init.c (build_new_1): Don't use type size argument for Java
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 6188f5e..c78482c 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -290,7 +290,8 @@ build_base_path (enum tree_code code,
expr = save_expr (expr);
if (want_pointer && !nonnull)
- null_test = build (EQ_EXPR, boolean_type_node, expr, integer_zero_node);
+ null_test = fold (build2 (NE_EXPR, boolean_type_node,
+ expr, integer_zero_node));
offset = BINFO_OFFSET (binfo);
@@ -365,9 +366,9 @@ build_base_path (enum tree_code code,
expr = build_indirect_ref (expr, NULL);
if (null_test)
- expr = build (COND_EXPR, target_type, null_test,
- build1 (NOP_EXPR, target_type, integer_zero_node),
- expr);
+ expr = fold (build3 (COND_EXPR, target_type, null_test, expr,
+ fold (build1 (NOP_EXPR, target_type,
+ integer_zero_node))));
return expr;
}