From: Jason Merrill <jason@redhat.com>
Date: Fri, 5 Jul 2002 22:11:38 +0000 (-0400)
Subject: cvt.c (cp_convert_to_pointer): Call force_fit_type for null pointers.
X-Git-Tag: releases/gcc-3.1.1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beed37972f9f3f78338021bb844961cac4dfc220;p=thirdparty%2Fgcc.git

cvt.c (cp_convert_to_pointer): Call force_fit_type for null pointers.

        * cvt.c (cp_convert_to_pointer): Call force_fit_type for null
        pointers.

From-SVN: r55273
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f4909b06b14a..2390b14fcac0 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 25c05dcf3ef2..9b4f68f2fa11 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;
     }