extended.texi (__builtin_expect): We no longer require second argument to be constant.

	* extended.texi (__builtin_expect): We no longer require second argument
	to be constant.
	* gengtype.c (adjust_field_rtx_def): Drop NOTE_INSN_EXPECTED_VALUE.
	* builtins.c (expand_builtin_expect): Simplify.
	(expand_builtin_expect_jump): Kill.
	* final.c (final_scan_insn): Do not skip the removed notes.
	* insn-notes.def (LOOP_BEG, LOOP_END, REPEATED_LINE_NUMBER,
	EXPECTED_VALUE): Remove.
	* dojump.c (do_jump): Do not care about __builtin_expect.
	* predict.c (expected_value_to_br_prob): Kill.
	* function.c (expand_function_end): Do not expand
	NOTE_INSN_REPEATED_LINE_NUMBER.
	* print-rtl.c (print_rtx): Do not pretty print the removed notes.
	* expect.c (sjlj_emit_function_enter): Emit directly branch probability.
	* cfgexpand.c (add_reg_br_prob_note): Export.
	* cfgcleanup.c (rest_of_handle_jump2): Do not call
	expected_value_to_br_prob.
	* cfglayout.c (duplicate_insn_chain): Do not deal with removed notes.
	* rtl.h (add_reg_br_prob_note): Declare.

From-SVN: r118697

diff --git a/gcc/insn-notes.def b/gcc/insn-notes.def
index c4b477fdad9707a568ece725e85324828421992f..9f942bb354d45cdb460c621110679543d66c51c9 100644 (file)
--- a/gcc/insn-notes.def
+++ b/gcc/insn-notes.def
@@ -43,10 +43,6 @@ INSN_NOTE (DELETED_LABEL)
 INSN_NOTE (BLOCK_BEG)
 INSN_NOTE (BLOCK_END)
 
-/* These mark the extremes of a loop.  */
-INSN_NOTE (LOOP_BEG)
-INSN_NOTE (LOOP_END)
-
 /* This note indicates the start of the real body of the function,
    i.e. the point just after all of the parms have been moved into
    their homes, etc.  */
@@ -70,19 +66,9 @@ INSN_NOTE (EPILOGUE_BEG)
 INSN_NOTE (EH_REGION_BEG)
 INSN_NOTE (EH_REGION_END)
 
-/* Generated whenever a duplicate line number note is output.
-   For example, one is output after the end of an inline function,
-   in order to prevent the line containing the inline call from
-   being counted twice in gcov.  */
-INSN_NOTE (REPEATED_LINE_NUMBER)
-
 /* The location of a variable.  */
 INSN_NOTE (VAR_LOCATION)
 
-/* Record the expected value of a register at a location.  Uses
-   NOTE_EXPECTED_VALUE; stored as (eq (reg) (const_int)).  */
-INSN_NOTE (EXPECTED_VALUE)
-
 /* Record the struct for the following basic block.  Uses
    NOTE_BASIC_BLOCK.  FIXME: Redundant with the basic block pointer
    now included in every insn.  */