r175702 - in /branches/google/gcc-4_6: ./ gcc/C...

[dnovillo@gcc.gnu.org]

Author: dnovillo
Date: Thu Jun 30 13:24:00 2011
New Revision: 175702

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=175702
Log:
ChangeLog.google-4_6
2011-06-29  Diego Novillo  <dnovillo@google.com>

	Backport from gcc-4_6-branch

	2011-06-29  Martin Jambor  <mjambor@suse.cz>
		Backport from mainline
		2011-06-24  Martin Jambor  <mjambor@suse.cz>

		PR tree-optimizations/49516
		* tree-sra.c (sra_modify_assign): Choose the safe path for
		aggregate copies if we also did scalar replacements.

testsuite/ChangeLog.google-4_6
2011-06-29  Diego Novillo  <dnovillo@google.com>

	Backport from gcc-4_6-branch

	2011-06-29  Martin Jambor  <mjambor@suse.cz>
		Backport from mainline
		2011-06-24  Martin Jambor  <mjambor@suse.cz>

		PR tree-optimizations/49516
		* g++.dg/tree-ssa/pr49516.C: New test.


Added:
    branches/google/gcc-4_6/gcc/testsuite/g++.dg/tree-ssa/pr49516.C
      - copied unchanged from r175634, branches/gcc-4_6-branch/gcc/testsuite/g++.dg/tree-ssa/pr49516.C
Modified:
    branches/google/gcc-4_6/   (props changed)
    branches/google/gcc-4_6/gcc/ChangeLog.google-4_6
    branches/google/gcc-4_6/gcc/config/rs6000/rs6000.c   (props changed)
    branches/google/gcc-4_6/gcc/config/rs6000/rs6000.h   (props changed)
    branches/google/gcc-4_6/gcc/testsuite/ChangeLog.google-4_6
    branches/google/gcc-4_6/gcc/testsuite/gcc.target/powerpc/ppc-round.c   (props changed)
    branches/google/gcc-4_6/gcc/tree-sra.c
    branches/google/gcc-4_6/libjava/classpath/   (props changed)

Propchange: branches/google/gcc-4_6/
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/
            ('svnmerge-integrated' modified)

Propchange: branches/google/gcc-4_6/gcc/config/rs6000/rs6000.c
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/gcc/config/rs6000/rs6000.h
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/gcc/testsuite/gcc.target/powerpc/ppc-round.c
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/libjava/classpath/
            ('svn:mergeinfo' modified)