Applied:

svn merge svn+ssh://amylaar@gcc.gnu.org/svn/gcc/branches/gcc-4_4-branch@145488 svn+ssh://amylaar@gcc.gnu.org/svn/gcc/branches/arc-milepost-branch
, then removed obsolete gcc/config/arc port, and reversed merge direction
for files with more than 40 lines worth of diff from the arc-milepost-branch:

configure
Makefile.in
gcc/doc/extend.texi
gcc/doc/tm.texi
gcc/doc/invoke.texi
gcc/targhooks.c
gcc/tree-dump.c
gcc/tree-complex.c
gcc/targhooks.h
gcc/regstat.c
gcc/machmode.h
gcc/genrecog.c
gcc/gengtype.c
gcc/mkconfig.sh
gcc/java/Make-lang.in
gcc/java/builtins.c
gcc/optabs.c
gcc/optabs.h
gcc/postreload.c
gcc/tree-ssa-loop-ch.c
gcc/tree.c
gcc/tree.h
gcc/reload.c
gcc/tree-pass.h
gcc/reload.h
gcc/target.h
gcc/rtlanal.c
gcc/configure
gcc/final.c
gcc/builtins.c
gcc/genoutput.c
gcc/fold-const.c
gcc/genautomata.c
gcc/toplev.c
gcc/toplev.h
gcc/reorg.c
gcc/omega.c
gcc/regs.h
gcc/df-scan.c
gcc/cp/typeck.c
gcc/cp/init.c
gcc/cp/call.c
gcc/cp/Make-lang.in
gcc/cp/tree.c
gcc/cp/cp-tree.h
gcc/cp/pt.c
gcc/cp/semantics.c
gcc/cp/parser.c
gcc/haifa-sched.c
gcc/dbxout.c
gcc/tree-ssa-loop-ivopts.c
gcc/df-core.c
gcc/cse.c
gcc/sel-sched.c
gcc/c-pch.c
gcc/dwarf2out.c
gcc/expr.c
gcc/expr.h
gcc/longlong.h
gcc/opts.c
gcc/genattrtab.c
gcc/genattr.c
gcc/tree-ssa-loop-ivcanon.c
gcc/predict.c
gcc/tree-parloops.c
gcc/recog.c
gcc/tree-ssa-address.c
gcc/timevar.c
gcc/dse.c
gcc/matrix-reorg.c
gcc/tree-eh.c
gcc/fortran/gfortran.h
gcc/fortran/module.c
gcc/fortran/trans-intrinsic.c
gcc/regmove.c
gcc/configure.ac
gcc/function.c
gcc/tree-vectorizer.c
gcc/function.h
gcc/tree-vectorizer.h
gcc/df.h
gcc/sdbout.c
gcc/stor-layout.c
gcc/gcse.c
gcc/alias.c
gcc/ira-build.c
gcc/ggc.h
gcc/gimplify.c
gcc/calls.c
gcc/genmodes.c
gcc/loop-doloop.c
gcc/rtl-factoring.c
gcc/bt-load.c
gcc/except.c
gcc/except.h
gcc/emit-rtl.c
gcc/cfgexpand.c
gcc/tree-ssa-pre.c
gcc/explow.c
gcc/genpreds.c
gcc/opth-gen.awk
gcc/common.opt
gcc/varasm.c
gcc/ira.c
gcc/target-def.h
gcc/ira-costs.c
gcc/rtl.h
gcc/sched-int.h
gcc/tree-optimize.c
gcc/output.h
gcc/combine.c
gcc/resource.c
gcc/var-tracking.c
gcc/cfgloop.h
gcc/c-common.c
gcc/tree-flow.h
gcc/df-problems.c
gcc/config.gcc
gcc/reginfo.c
gcc/Makefile.in
gcc/sched-rgn.c
gcc/gimple.c
gcc/basic-block.h
gcc/gimple.h
gcc/tree-cfg.c
gcc/passes.c
gcc/config/spu/spu.c
gcc/config/spu/spu.h
gcc/config/spu/spu-c.c
gcc/config/i386/i386.md
gcc/config/i386/i386.c
gcc/config/sh/sh.c
gcc/config/sh/sh.h
gcc/config/sh/sh.md
gcc/config/rs6000/rs6000.c
gcc/combine-stack-adj.c
gcc/collect2.c
gcc/reload1.c
libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/1.cc
libstdc++-v3/testsuite/lib/libstdc++.exp
configure.ac
libcpp/symtab.c
libcpp/include/symtab.h

and resolved textual conflicts.


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/milepost-integration@148225 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 1 deletions

diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index c8db7d2bcd6..b2cbd0fae57 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -891,7 +891,7 @@ update_jump_functions_after_inlining (struct cgraph_edge *cs,
       /* We must check range due to calls with variable number of arguments:  */
       if (dst->value.formal_id >= (unsigned) ipa_get_cs_argument_count (top))
 	{
-	  dst->type = IPA_BOTTOM;
+	  dst->type = IPA_UNKNOWN;
 	  continue;
 	}