r177072 - in /branches/google/gcc-4_6: gcc/cp/C...

[jyasskin at gcc dot gnu dot org]

Author: jyasskin
Date: Mon Aug  1 20:34:42 2011
New Revision: 177072

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=177072
Log:
Merge r176851 from gcc-4_6-branch to google/gcc-4_6.

Propagate the source location of a template's function_decl to the
template_decl built out of it.  Without this, specializations
generated before the template was defined get the location of the
closing ')' instead of the location of the template's name, which can
produce inconsistent locations between translation units, which makes
gold's ODR checker unhappy.

	* gcc/cp/pt.c (build_template_decl): Copy the function_decl's source
	location to the new template_decl.
	* gcc/testsuite/g++.old-deja/g++.pt/crash60.C: Updated.
	* libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Updated.

Modified:
    branches/google/gcc-4_6/gcc/cp/ChangeLog
    branches/google/gcc-4_6/gcc/cp/pt.c
    branches/google/gcc-4_6/gcc/testsuite/ChangeLog
    branches/google/gcc-4_6/gcc/testsuite/g++.old-deja/g++.pt/crash60.C
    branches/google/gcc-4_6/libstdc++-v3/ChangeLog
    branches/google/gcc-4_6/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc