c-format.c (check_format_arg): Handle string literals of the form &"string"[offset].

2005-05-14  Richard Guenther  <rguenth@gcc.gnu.org>

	* c-format.c (check_format_arg): Handle string literals of
	the form &"string"[offset].

	* g++.dg/warn/format4.C: New testcase.

From-SVN: r99652

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3203e67..286c65c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-13  Richard Guenther  <rguenth@gcc.gnu.org>
+
+       * c-format.c (check_format_arg): Handle string literals of
+       the form &"string"[offset].
+
+       * g++.dg/warn/format4.C: New testcase.
+
 2005-05-13  Kazu Hirata  <kazu@cs.umass.edu>
 
        * config/mips/3000.md, config/mips/4000.md,

diff --git a/gcc/c-format.c b/gcc/c-format.c
index dd570ab..daa071e 100644 (file)
--- a/gcc/c-format.c
+++ b/gcc/c-format.c
@@ -1260,6 +1260,10 @@ check_format_arg (void *ctx, tree format_tree,
       return;
     }
   format_tree = TREE_OPERAND (format_tree, 0);
+  if (TREE_CODE (format_tree) == ARRAY_REF
+      && host_integerp (TREE_OPERAND (format_tree, 1), 0)
+      && (offset += tree_low_cst (TREE_OPERAND (format_tree, 1), 0)) >= 0)
+    format_tree = TREE_OPERAND (format_tree, 0);
   if (TREE_CODE (format_tree) == VAR_DECL
       && TREE_CODE (TREE_TYPE (format_tree)) == ARRAY_TYPE
       && (array_init = decl_constant_value (format_tree)) != format_tree

diff --git a/gcc/testsuite/g++.dg/warn/format4.C b/gcc/testsuite/g++.dg/warn/format4.C
new file mode 100644 (file)
index 0000000..fa622fc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/format4.C
@@ -0,0 +1,13 @@
+// { dg-do compile }
+// { dg-options "-Wformat=2" }
+
+extern "C" int printf (const char*, ...);
+
+void foo(int i)
+{
+       printf("Hello World %d!\n", i);
+       printf(&"Hello World %d!\n"[0], i);
+       printf(&"Hello World %d!\n"[6], i);
+       printf(&"Hello World %d!\n"[8]-2, i);
+       printf(&"Hello World %d!\n"[4]+2, i);
+}