--- a/gcc/cif-code.def	Sun Aug 21 07:07:55 2011 +0900
+++ b/gcc/cif-code.def	Fri Oct 27 22:46:09 2017 +0900
@@ -1,7 +1,7 @@
 /* This file contains the definitions of the cgraph_inline_failed_t
    enums used in GCC.
 
-   Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
    Contributed by Doug Kwan <dougkwan@google.com>
 
 This file is part of GCC.
@@ -28,65 +28,114 @@
    which is a NULL pointer.  */
 
 /* Inlining successful.  This must be the first code.  */
-DEFCIFCODE(OK , NULL)
+DEFCIFCODE(OK, CIF_FINAL_NORMAL, NULL)
 
 /* Inlining failed for an unspecified reason.  */
-DEFCIFCODE(UNSPECIFIED , "")
+DEFCIFCODE(UNSPECIFIED, CIF_FINAL_ERROR, "")
 
 /* Function has not be considered for inlining.  This is the code for
    functions that have not been rejected for inlining yet.  */
-DEFCIFCODE(FUNCTION_NOT_CONSIDERED,
+DEFCIFCODE(FUNCTION_NOT_CONSIDERED, CIF_FINAL_NORMAL,
 	   N_("function not considered for inlining"))
 
+/* Caller is compiled with optimizations disabled.  */
+DEFCIFCODE(FUNCTION_NOT_OPTIMIZED, CIF_FINAL_ERROR,
+	   N_("caller is not optimized"))
+
 /* Inlining failed owing to unavailable function body.  */
-DEFCIFCODE(BODY_NOT_AVAILABLE, N_("function body not available"))
+DEFCIFCODE(BODY_NOT_AVAILABLE, CIF_FINAL_ERROR,
+	   N_("function body not available"))
 
-DEFCIFCODE(REDEFINED_EXTERN_INLINE,
-           N_("redefined extern inline functions are not considered for "
-              "inlining"))
+/* Extern inline function that has been redefined.  */
+DEFCIFCODE(REDEFINED_EXTERN_INLINE, CIF_FINAL_ERROR,
+	   N_("redefined extern inline functions are not considered for "
+	      "inlining"))
 
 /* Function is not inlinable.  */
-DEFCIFCODE(FUNCTION_NOT_INLINABLE, N_("function not inlinable"))
+DEFCIFCODE(FUNCTION_NOT_INLINABLE, CIF_FINAL_ERROR,
+	   N_("function not inlinable"))
+
+/* Function is overwritable.  */
+DEFCIFCODE(OVERWRITABLE, CIF_FINAL_ERROR,
+	   N_("function body can be overwritten at link time"))
 
 /* Function is not an inlining candidate.  */
-DEFCIFCODE(FUNCTION_NOT_INLINE_CANDIDATE, N_("function not inline candidate"))
+DEFCIFCODE(FUNCTION_NOT_INLINE_CANDIDATE, CIF_FINAL_NORMAL,
+	   N_("function not inline candidate"))
 
 /* Inlining failed because of various limit parameters.  */
-DEFCIFCODE(LARGE_FUNCTION_GROWTH_LIMIT,
+DEFCIFCODE(LARGE_FUNCTION_GROWTH_LIMIT, CIF_FINAL_NORMAL,
 	   N_("--param large-function-growth limit reached"))
-DEFCIFCODE(LARGE_STACK_FRAME_GROWTH_LIMIT,
+DEFCIFCODE(LARGE_STACK_FRAME_GROWTH_LIMIT, CIF_FINAL_NORMAL,
 	   N_("--param large-stack-frame-growth limit reached"))
-DEFCIFCODE(MAX_INLINE_INSNS_SINGLE_LIMIT,
+DEFCIFCODE(MAX_INLINE_INSNS_SINGLE_LIMIT, CIF_FINAL_NORMAL,
 	   N_("--param max-inline-insns-single limit reached"))
-DEFCIFCODE(MAX_INLINE_INSNS_AUTO_LIMIT,
+DEFCIFCODE(MAX_INLINE_INSNS_AUTO_LIMIT, CIF_FINAL_NORMAL,
 	   N_("--param max-inline-insns-auto limit reached"))
-DEFCIFCODE(INLINE_UNIT_GROWTH_LIMIT,
+DEFCIFCODE(INLINE_UNIT_GROWTH_LIMIT, CIF_FINAL_NORMAL,
 	   N_("--param inline-unit-growth limit reached"))
 
 /* Recursive inlining.  */
-DEFCIFCODE(RECURSIVE_INLINING, N_("recursive inlining"))
+DEFCIFCODE(RECURSIVE_INLINING, CIF_FINAL_NORMAL,
+	   N_("recursive inlining"))
 
 /* Call is unlikely.  */
-DEFCIFCODE(UNLIKELY_CALL, N_("call is unlikely and code size would grow"))
+DEFCIFCODE(UNLIKELY_CALL, CIF_FINAL_NORMAL,
+	   N_("call is unlikely and code size would grow"))
 
-/* Function is not declared as an inline.  */
-DEFCIFCODE(NOT_DECLARED_INLINED,
+/* Function is not declared as inline.  */
+DEFCIFCODE(NOT_DECLARED_INLINED, CIF_FINAL_NORMAL,
 	   N_("function not declared inline and code size would grow"))
 
-/* Inlining suppressed due to size optimization.  */
-DEFCIFCODE(OPTIMIZING_FOR_SIZE,
-	   N_("optimizing for size and code size would grow"))
+/* Caller and callee disagree on the arguments.  */
+DEFCIFCODE(MISMATCHED_ARGUMENTS, CIF_FINAL_ERROR,
+	   N_("mismatched arguments"))
 
-/* Inlining failed because of mismatched options or arguments.  */
-DEFCIFCODE(TARGET_OPTION_MISMATCH, N_("target specific option mismatch"))
-DEFCIFCODE(MISMATCHED_ARGUMENTS, N_("mismatched arguments"))
+/* Caller and callee disagree on the arguments.  */
+DEFCIFCODE(LTO_MISMATCHED_DECLARATIONS, CIF_FINAL_ERROR,
+	   N_("mismatched declarations during linktime optimization"))
 
 /* Call was originally indirect.  */
-DEFCIFCODE(ORIGINALLY_INDIRECT_CALL,
+DEFCIFCODE(ORIGINALLY_INDIRECT_CALL, CIF_FINAL_NORMAL,
 	   N_("originally indirect function call not considered for inlining"))
 
 /* Ths edge represents an indirect edge with a yet-undetermined callee .  */
-DEFCIFCODE(INDIRECT_UNKNOWN_CALL,
+DEFCIFCODE(INDIRECT_UNKNOWN_CALL, CIF_FINAL_NORMAL,
 	   N_("indirect function call with a yet undetermined callee"))
 
-DEFCIFCODE(OVERWRITABLE, N_("function body can be overwriten at linktime"))
+/* We can't inline different EH personalities together.  */
+DEFCIFCODE(EH_PERSONALITY, CIF_FINAL_ERROR,
+	   N_("exception handling personality mismatch"))
+
+/* We can't inline if the callee can throw non-call exceptions but the
+   caller cannot.  */
+DEFCIFCODE(NON_CALL_EXCEPTIONS, CIF_FINAL_ERROR,
+	   N_("non-call exception handling mismatch"))
+
+/* We can't inline because of mismatched target specific options.  */
+DEFCIFCODE(TARGET_OPTION_MISMATCH, CIF_FINAL_ERROR,
+	   N_("target specific option mismatch"))
+
+/* We can't inline because of mismatched optimization levels.  */
+DEFCIFCODE(OPTIMIZATION_MISMATCH, CIF_FINAL_ERROR,
+	   N_("optimization level attribute mismatch"))
+
+/* We can't inline because the callee refers to comdat-local symbols.  */
+DEFCIFCODE(USES_COMDAT_LOCAL, CIF_FINAL_ERROR,
+	   N_("callee refers to comdat-local symbols"))
+
+/* We can't inline because of mismatched caller/callee attributes.  */
+DEFCIFCODE(ATTRIBUTE_MISMATCH, CIF_FINAL_ERROR,
+	   N_("function attribute mismatch"))
+
+/* We can't inline because of mismatched caller/callee attributes.  */
+DEFCIFCODE(CILK_SPAWN, CIF_FINAL_ERROR,
+	   N_("caller function contains cilk spawn"))
+
+/* We proved that the call is unreachable.  */
+DEFCIFCODE(UNREACHABLE, CIF_FINAL_ERROR,
+	   N_("unreachable"))
+
+/* We can't inline because of instrumentation thunk.  */
+DEFCIFCODE(CHKP, CIF_FINAL_ERROR,
+	   N_("caller is instrumentation thunk"))