PR middle-end/49139 fix always_inline diagnostics

From-SVN: r175240

gcc/ChangeLog

+2011-06-21  Christian Bruel  <christian.bruel@st.com>
+	
+	PR middle-end/49139
+	* cgraphunit.c (process_function_and_variable_attributes): warn when
+	always_inline functions that are not inline.
+	* ipa-inline-transform.c (inline_transform): Always call optimize_inline.
+	* tree-inline.c (tree_inlinable_function_p): Use error instead of sorry.
+	(expand_call_inline): Likewise.
+	
 2011-06-21  Jakub Jelinek  <jakub@redhat.com>
 
 	* Makefile.in (dg_target_exps): Set.
@@ -52,6 +61,7 @@
 
 	* regrename.c (do_replace): Don't update notes.
 
+>>>>>>> .r175238
 2011-06-20  Alan Modra  <amodra@gmail.com>
 
 	* config/rs6000/rs6000.c (create_TOC_reference): Wrap high part

gcc/testsuite/ChangeLog

+2011-06-22  Christian Bruel  <christian.bruel@st.com>
+	
+	PR middle-end/49139
+	* gcc.dg/always_inline.c: Removed -Winline. Update checks
+	* gcc.dg/always_inline2.c: Likewise.
+	* gcc.dg/always_inline3.c: Likewise.
+	* gcc.dg/debug/pr41264-1.c: Add -Wno-attributes.
+	* gcc.dg/inline_1.c: Likewise.
+	* gcc.dg/inline_2.c: Likewise.
+	* gcc.dg/inline_3.c: Likewise.
+	* gcc.dg/inline_4.c: Likewise.
+	* gcc.dg/20051201-1.c: Likewise.
+	* gcc.dg/torture/pta-structcopy-1.c: Likewise.
+	* gcc.dg/inline-22.c: Likewise.
+	* gcc.dg/lto/20090218-1_0.c: Set inline keyword.
+	* gcc.dg/lto/20090218-1_1.c: Likewise.
+	* g++.dg/ipa/devirt-7.C: Likewise.
+	* gcc.dg/uninit-pred-5_a.c: Likewise.
+	* gcc.dg/uninit-pred-5_b.c: Likewise.
+	* gcc.dg/fail_always_inline.c: New.
+	
 2011-06-21  Jakub Jelinek  <jakub@redhat.com>
 
 	* Make-lang.in (check_gfortran_parallelize): Parallelize dg.exp