From: Richard Guenther <rguenther@suse.de>
Date: Tue, 22 May 2012 09:17:42 +0000 (+0000)
Subject: backport: re PR c/52862 (ICE convert_to_pointer, at convert.c:50)
X-Git-Tag: releases/gcc-4.6.4~533
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49527317457f29d7a5590db54333cbb569b13d68;p=thirdparty%2Fgcc.git

backport: re PR c/52862 (ICE convert_to_pointer, at convert.c:50)

2012-05-22  Richard Guenther  <rguenther@suse.de>

        Backport from mainline
        2012-04-12  Richard Guenther  <rguenther@suse.de>

	PR c/52862
	* convert.c (convert_to_pointer): Remove special-casing of
	zero.

	* gcc.dg/pr52862.c: New testcase.

From-SVN: r187762
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ca2386388a22..2d96e00c1e92 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-22  Richard Guenther  <rguenther@suse.de>
+
+	Backport from mainline
+	2012-04-12  Richard Guenther  <rguenther@suse.de>
+
+	PR c/52862
+	* convert.c (convert_to_pointer): Remove special-casing of
+	zero.
+
 2012-05-21  Joseph Myers  <joseph@codesourcery.com>
 
 	PR c/53418
diff --git a/gcc/convert.c b/gcc/convert.c
index 21d09c157eb9..765c542dbdbc 100644
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -44,11 +44,6 @@ convert_to_pointer (tree type, tree expr)
   if (TREE_TYPE (expr) == type)
     return expr;
 
-  /* Propagate overflow to the NULL pointer.  */
-  if (integer_zerop (expr))
-    return force_fit_type_double (type, double_int_zero, 0,
-				  TREE_OVERFLOW (expr));
-
   switch (TREE_CODE (TREE_TYPE (expr)))
     {
     case POINTER_TYPE:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dc2d3736da0c..710bcf6378f2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-22  Richard Guenther  <rguenther@suse.de>
+
+	Backport from mainline
+	2012-04-12  Richard Guenther  <rguenther@suse.de>
+
+	PR c/52862
+	* gcc.dg/pr52862.c: New testcase.
+
 2012-05-21  Joseph Myers  <joseph@codesourcery.com>
 
 	PR c/53418
diff --git a/gcc/testsuite/gcc.dg/pr52862.c b/gcc/testsuite/gcc.dg/pr52862.c
new file mode 100644
index 000000000000..febe7a8289b1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr52862.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */
+
+void ASMAtomicWritePtrVoid(const void *pv);
+void rtThreadDestroy(void)
+{
+  void * const pvTypeChecked = ((void *)0);
+  ASMAtomicWritePtrVoid((void *)(pvTypeChecked));
+}