diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f23256ade89..1b7172f4424 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-17  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c++/31517
+	* pt.c (value_dependent_expression_p): Handle MODOP_EXPRs.
+
 2007-04-16  Seongbae Park <seongbae.park@gmail.com>
 
 	PR c++/29365
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 906b8d5b1a9..05d7752b3df 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -14949,6 +14949,10 @@ value_dependent_expression_p (tree expression)
 		|| (type2 ? dependent_type_p (type2) : false));
       }
 
+    case MODOP_EXPR:
+      return ((value_dependent_expression_p (TREE_OPERAND (expression, 0)))
+	      || (value_dependent_expression_p (TREE_OPERAND (expression, 2))));
+
     default:
       /* A constant expression is value-dependent if any subexpression is
 	 value-dependent.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 36592abfa08..bb25db03d27 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-17  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c++/31517
+	* g++.dg/template/init7.C: New test.
+
 2007-04-17  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	PR rtl-optimization/31360
diff --git a/gcc/testsuite/g++.dg/template/init7.C b/gcc/testsuite/g++.dg/template/init7.C
new file mode 100644
index 00000000000..e2267767b89
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/init7.C
@@ -0,0 +1,9 @@
+/* PR c++/31517. This used to ICE.  */
+/* { dg-do "compile" } */
+
+template<typename> struct A
+{
+  static const int i=0;
+};
+
+template<typename T> const int A<T>::i = 0=0; /* { dg-error "duplicate initialization" } */