[llvm-commits] [llvm-gcc-4.2] r55663 - in /llvm-gcc-4.2/trunk/gcc: cgraph.c tree-inline.c

[Bill Wendling]

Author: void
Date: Tue Sep  2 16:53:06 2008
New Revision: 55663

URL: http://llvm.org/viewvc/llvm-project?rev=55663&view=rev
Log:
Fix wording.

Modified:
    llvm-gcc-4.2/trunk/gcc/cgraph.c
    llvm-gcc-4.2/trunk/gcc/tree-inline.c

Modified: llvm-gcc-4.2/trunk/gcc/cgraph.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cgraph.c?rev=55663&r1=55662&r2=55663&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cgraph.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cgraph.c Tue Sep  2 16:53:06 2008
@@ -396,7 +396,8 @@
   gcc_assert (get_call_expr_in (call_stmt));
 
   if (!DECL_SAVED_TREE (callee->decl))
-    edge->inline_failed = N_("function body not available");
+    /* APPLE LOCAL wording 4598393 */
+    edge->inline_failed = N_("the function body must appear before caller");
   else if (callee->local.redefined_extern_inline)
     edge->inline_failed = N_("redefined extern inline functions are not "
 			     "considered for inlining");

Modified: llvm-gcc-4.2/trunk/gcc/tree-inline.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree-inline.c?rev=55663&r1=55662&r2=55663&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree-inline.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tree-inline.c Tue Sep  2 16:53:06 2008
@@ -2040,8 +2040,10 @@
 	  /* Avoid warnings during early inline pass. */
 	  && (!flag_unit_at_a_time || cgraph_global_info_ready))
 	{
-	  sorry ("inlining failed in call to %q+F: %s", fn, reason);
-	  sorry ("called from here");
+	  /* APPLE LOCAL begin wording 4598393 */
+	  error ("%<always_inline%> function could not be inlined in call to %q+F: %s", fn, reason);
+	  error ("called from here");
+	  /* APPLE LOCAL end wording 4598393 */
 	}
       else if (warn_inline && DECL_DECLARED_INLINE_P (fn)
 	       && !DECL_IN_SYSTEM_HEADER (fn)
@@ -2652,7 +2654,7 @@
 #ifdef ENABLE_LLVM
     SET_DECL_LLVM (copy, 0);
 #else
-    SET_DECL_RTL (copy, NULL_RTX); 
+    SET_DECL_RTL (copy, NULL_RTX);
 #endif
   /* LLVM_LOCAL end */