aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Pinski <pinskia@physics.uc.edu>2006-01-26 14:59:26 +0000
committerAndrew Pinski <pinskia@gcc.gnu.org>2006-01-26 06:59:26 -0800
commitf6f083604b2a742a0b15e01384fa1337ee231400 (patch)
tree3ddf13d99d2fe455060fa7801f66ca377299cd4c
parent62f3e894c581600047c65b145f24441dd13c4b39 (diff)
downloadgcc-f6f083604b2a742a0b15e01384fa1337ee231400.zip
gcc-f6f083604b2a742a0b15e01384fa1337ee231400.tar.gz
gcc-f6f083604b2a742a0b15e01384fa1337ee231400.tar.bz2
re PR c/25861 (tree check fail at c-common.c:2430)
2006-01-26 Andrew Pinski <pinskia@physics.uc.edu> PR C/25861 * c-common.c (c_common_truthvalue_conversion) <case ADDR_EXPR>: Use a new variable, inner. PARM_DECLs are always non-weak. 2006-01-26 Andrew Pinski <pinskia@physics.uc.edu> PR C/25861 * gcc.c-torture/compile/pr25861.c: New test. From-SVN: r110256
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-common.c15
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr25861.c4
4 files changed, 23 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 71144c3..f925b00 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-26 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR C/25861
+ * c-common.c (c_common_truthvalue_conversion) <case ADDR_EXPR>:
+ Use a new variable, inner. PARM_DECLs are always non-weak.
+
2006-01-26 Shantonu Sen <ssen@opendarwin.org>
* tree.h (OMP_CLAUSE_SUBCODE_CHECK): Add definition for
diff --git a/gcc/c-common.c b/gcc/c-common.c
index 60035ea..fe99dfb 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -2456,25 +2456,26 @@ c_common_truthvalue_conversion (tree expr)
case ADDR_EXPR:
{
- if (DECL_P (TREE_OPERAND (expr, 0))
- && !DECL_WEAK (TREE_OPERAND (expr, 0)))
+ tree inner = TREE_OPERAND (expr, 0);
+ if (DECL_P (inner)
+ && (TREE_CODE (inner) == PARM_DECL || !DECL_WEAK (inner)))
{
/* Common Ada/Pascal programmer's mistake. We always warn
about this since it is so bad. */
warning (OPT_Walways_true, "the address of %qD, will always evaluate as %<true%>",
- TREE_OPERAND (expr, 0));
+ inner);
return truthvalue_true_node;
}
/* If we are taking the address of an external decl, it might be
zero if it is weak, so we cannot optimize. */
- if (DECL_P (TREE_OPERAND (expr, 0))
- && DECL_EXTERNAL (TREE_OPERAND (expr, 0)))
+ if (DECL_P (inner)
+ && DECL_EXTERNAL (inner))
break;
- if (TREE_SIDE_EFFECTS (TREE_OPERAND (expr, 0)))
+ if (TREE_SIDE_EFFECTS (inner))
return build2 (COMPOUND_EXPR, truthvalue_type_node,
- TREE_OPERAND (expr, 0), truthvalue_true_node);
+ inner, truthvalue_true_node);
else
return truthvalue_true_node;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dde3de8..0042b36 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-26 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR C/25861
+ * gcc.c-torture/compile/pr25861.c: New test.
+
2006-01-26 Paul Brook <paul@codesourcery.com>
* gcc.dg/compat/struct-layout-1.exp: Pass -e to generator program
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr25861.c b/gcc/testsuite/gcc.c-torture/compile/pr25861.c
new file mode 100644
index 0000000..cdd8efb
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr25861.c
@@ -0,0 +1,4 @@
+int f(void *a)
+{
+ return !(&a);
+}