r173161 - in /branches/google/main/gcc: ChangeL...

[dnovillo@gcc.gnu.org]

Author: dnovillo
Date: Fri Apr 29 14:36:08 2011
New Revision: 173161

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=173161
Log:
ChangeLog.google-main
2011-04-27  Le-Chun Wu  <lcwu@google.com>

	* c-decl.c (warn_if_shadowing): Use the warning code corresponding
	to the given -Wshadow- variant.
	* common.opt (Wshadow-local): New option.
	(Wshadow-compatible-local): New option.
	* invoke.texi: Document Wshadow-local and Wshadow-compatible-local.
	* opts.c (common_handle_option): Handle OPT_Wshadow and
	OPT_Wshadow_local.
	Do not enable Wshadow-local nor Wshadow-compatible-local if
	Wshadow is disabled.

cp/ChangeLog.google-main
2011-04-27  Le-Chun Wu  <lcwu@google.com>

	* name-lookup.c (pushdecl_maybe_friend): When emitting a
	shadowing warning, use the code corresponding to the
	given -Wshadow- variant.

testsuite/ChangeLog.google-main
2011-04-27  Le-Chun Wu  <lcwu@google.com>

	* g++.dg/warn/Wshadow-compatible-local-1.C: New.
	* g++.dg/warn/Wshadow-local-1.C: New.
	* g++.dg/warn/Wshadow-local-2.C: New.
	* gcc.dg/Wshadow-compatible-local-1.c: New.
	* gcc.dg/Wshadow-local-1.c: New.
	* gcc.dg/Wshadow-local-2.c: New.
	* gcc.dg/Wshadow-local-3.c: New.

Added:
    branches/google/main/gcc/testsuite/g++.dg/warn/Wshadow-compatible-local-1.C
    branches/google/main/gcc/testsuite/g++.dg/warn/Wshadow-local-1.C
    branches/google/main/gcc/testsuite/g++.dg/warn/Wshadow-local-2.C
    branches/google/main/gcc/testsuite/gcc.dg/Wshadow-compatible-local-1.c
    branches/google/main/gcc/testsuite/gcc.dg/Wshadow-local-1.c
    branches/google/main/gcc/testsuite/gcc.dg/Wshadow-local-2.c
    branches/google/main/gcc/testsuite/gcc.dg/Wshadow-local-3.c
Modified:
    branches/google/main/gcc/ChangeLog.google-main
    branches/google/main/gcc/c-decl.c
    branches/google/main/gcc/common.opt
    branches/google/main/gcc/cp/ChangeLog.google-main
    branches/google/main/gcc/cp/name-lookup.c
    branches/google/main/gcc/doc/invoke.texi
    branches/google/main/gcc/opts.c
    branches/google/main/gcc/testsuite/ChangeLog.google-main