summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2002-07-05 22:11:38 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2002-07-05 22:11:38 +0000
commit3cb403a07b57ac83a2a3e4fe43aee7c76d49658e (patch)
tree3c32aeaf7948c30652b56ce3fdb88467b91f9b2f
parent5b9c436860740f90a0fb47baf8ca7c701a60d4a5 (diff)
downloadgcc-3cb403a07b57ac83a2a3e4fe43aee7c76d49658e.tar.gz
* cvt.c (cp_convert_to_pointer): Call force_fit_type for null
pointers. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-3_1-branch@55273 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/cvt.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f4909b06b14..2390b14fcac 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -5,6 +5,9 @@
2002-07-05 Jason Merrill <jason@redhat.com>
+ * cvt.c (cp_convert_to_pointer): Call force_fit_type for null
+ pointers.
+
PR optimization/7145
* tree.c (cp_copy_res_decl_for_inlining): Also copy DECL_INITIAL.
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 25c05dcf3ef..9b4f68f2fa1 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -249,6 +249,8 @@ cp_convert_to_pointer (type, expr, force)
else
expr = build_int_2 (0, 0);
TREE_TYPE (expr) = type;
+ /* Fix up the representation of -1 if appropriate. */
+ force_fit_type (expr, 0);
return expr;
}