diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fff96268288..620ef3d2dcd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-06  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* tree.c (initializer_zerop): Handle STRING_CST.
+
 2010-05-06  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
 	PR 40989
diff --git a/gcc/tree.c b/gcc/tree.c
index b9eeb3d9693..c45e807b43d 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -9414,6 +9414,19 @@ initializer_zerop (const_tree init)
 	return true;
       }
 
+    case STRING_CST:
+      {
+	int i;
+
+	/* We need to loop through all elements to handle cases like
+	   "\0" and "\0foobar".  */
+	for (i = 0; i < TREE_STRING_LENGTH (init); ++i)
+	  if (TREE_STRING_POINTER (init)[i] != '\0')
+	    return false;
+
+	return true;
+      }
+
     default:
       return false;
     }