diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7f810dd8b6c..0b3031ba1b6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-09  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR tree-opt/18904
+	* tree-chrec.c (chrec_convert): Use fold_convert
+	instead of convert.
+
 2004-12-09  Matt Rice  <ratmice@yahoo.com>
 
 	PR preprocessor/18102
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 51d6be53469..cc4f1ae43fc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-09  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR tree-opt/18904
+	* g++.dg/opt/ptrmem5.C: New test.
+
 2004-12-09  Alexandre Oliva  <aoliva@redhat.com>
 
 	* g++.dg/parse/typename5.C: Adjust for new error.
diff --git a/gcc/testsuite/g++.dg/opt/ptrmem5.C b/gcc/testsuite/g++.dg/opt/ptrmem5.C
new file mode 100644
index 00000000000..639ad2831c0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/ptrmem5.C
@@ -0,0 +1,19 @@
+// PR tree-opt/18904
+// { dg-do compile }
+// { dg-options "-O3" }
+
+struct Data;
+struct Wrapper {
+  Data* D;
+};
+struct Data {
+  int X;
+  void init(Wrapper&);
+};
+void Data::init( Wrapper &w ) {
+  int Data::* res  = &Data::X;
+  w.D = this;
+  for( int i = 0; i < 4; i++ )
+    (w.D->*res) = 0;
+}
+
diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
index be0d80a73fd..54960449217 100644
--- a/gcc/tree-chrec.c
+++ b/gcc/tree-chrec.c
@@ -983,7 +983,7 @@ chrec_convert (tree type,
 
     default:
       {
-	tree res = convert (type, chrec);
+	tree res = fold_convert (type, chrec);
 
 	/* Don't propagate overflows.  */
 	TREE_OVERFLOW (res) = 0;